summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamm Maguire <camm@debian.org>2013-10-30 14:49:36 +0000
committerCamm Maguire <camm@debian.org>2014-04-03 15:38:16 +0000
commite1eec8e0eff52030f6c62ed08e5fabbff4ec1ad0 (patch)
tree7fb33ac456ecde836b142166000724d34edc484b
parentc1067b32cda2416c28ef37e45f013b023028467c (diff)
downloadgcl-e1eec8e0eff52030f6c62ed08e5fabbff4ec1ad0.tar.gz
changes for latest mingw on windows
-rwxr-xr-xgcl/h/mingw.h2
-rw-r--r--gcl/makefile14
2 files changed, 9 insertions, 7 deletions
diff --git a/gcl/h/mingw.h b/gcl/h/mingw.h
index ce07a72b..48de4d37 100755
--- a/gcl/h/mingw.h
+++ b/gcl/h/mingw.h
@@ -226,3 +226,5 @@ extern int mingwlisten(FILE *);
#undef DBEGIN
#define DBEGIN _dbegin
+
+#define NOFREE_ERR
diff --git a/gcl/makefile b/gcl/makefile
index 65a8a3bb..3ca1ff57 100644
--- a/gcl/makefile
+++ b/gcl/makefile
@@ -352,13 +352,13 @@ $(HDIR)new_decl.h:
(cd o && $(MAKE) ../$@)
$(HDIR)cmpinclude.h: $(CMPINCLUDE_FILES) $(HDIR)config.h
- cat $(HDIR)config.h | sed -e "1,/Begin for cmpincl/d" \
- -e "/End for cmpinclude/,50000d" > tmpx.c
- echo '#include "h/config.h"\n#ifdef SGC\n"#define SGC"\n#else\n"#undef SGC"\n#endif' | $(CPP) 2>/dev/null| grep -v '^ *$$' | tail -1l | tr -d '"' >>tmpx.c
- cat $(CMPINCLUDE_FILES) >> tmpx.c
- $(CPP) -Ih -P -dD tmpx.c | grep -v "#define *__STDC_" | grep -v "#define *__GNUC_PATCHLEVEL__ " | grep -v "#define *__VERSION__ ">tmpx1 && mv tmpx1 tmpx.c
- ./xbin/move-if-changed mv tmpx.c h/cmpinclude.h
- ./xbin/move-if-changed cp h/cmpinclude.h o/cmpinclude.h
+ cat $(HDIR)config.h | sed -e "1,/Begin for cmpincl/d" -e "/End for cmpinclude/,50000d" > $(@F)
+ cd h && cpp tsgc.h 2>/dev/null| grep -v '^ *$$' | tail -1l | tr -d '"' >>../$(@F)
+ cat $(CMPINCLUDE_FILES) >> $(@F)
+ $(CC) -E -I./$(HDIR) -dD $(@F) | \
+ awk '/#define *(__STDC_(_|HOSTED__) |(pu|ge)tc|__GCC_ATOMIC_|__GNU_PATCHLEVEL__ |__VERSION__ )/ {next}{print}' >tmpx1 && mv tmpx1 $(@F)
+ ./xbin/move-if-changed mv $(@F) $@
+ ./xbin/move-if-changed cp $@ o/$(@F)
go:
mkdir go