Changeset: 602731114732 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=602731114732
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
Branch: Mar2018
Log Message:
Special case (NATIVE_)WIN32 flag in makefile generation.
No need for conditionals in the makefiles: we know whether the
makefile is for Windows or not.
diffs (33 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -208,6 +208,8 @@ def am_additional_libs(name, sep, type,
if l[0] not in ("-", "$", "@"):
l = am_translate_dir(l, am) + ".la"
if c:
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
@@ -241,6 +243,8 @@ def am_additional_install_libs(name, sep
l = l[3:]
l = 'install-%sLTLIBRARIES' % l
if c:
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -209,6 +209,8 @@ def msc_additional_libs(fd, name, sep, t
for l in list:
if '?' in l:
c, l = l.split('?', 1)
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ c = None
else:
c = None
d = None
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
