summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2011-05-25 15:35:04 +0200
committerforsyth <forsyth@vitanuova.com>2011-05-25 15:35:04 +0200
commit3b0f460e57442cf600c25eb2640f5818494a422d (patch)
tree133754bcff252b14d1ff4ac7200bcdaae4ac100f
parent2b69dba5038ffd0b59cf30a4c44bce549e5097f8 (diff)
20110525-1534
-rw-r--r--CHANGES2
-rw-r--r--include/version.h2
-rw-r--r--utils/5c/mkfile2
-rw-r--r--utils/6c/mkfile2
-rw-r--r--utils/8c/mkfile2
-rw-r--r--utils/kc/mkfile2
-rw-r--r--utils/qc/mkfile2
-rw-r--r--utils/vc/mkfile2
8 files changed, 9 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 7cbe223b..966a73c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110525
+ utils/[5678kqv]c/mkfile - include -I. before $CFLAGS to ensure right gc.h [issue 264]
20110516
merge changes from vac branch of mechiel-inferno-os (googlecode)
20110426
diff --git a/include/version.h b/include/version.h
index 272b825a..4628aeea 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20110516)"
+#define VERSION "Fourth Edition (20110525)"
diff --git a/utils/5c/mkfile b/utils/5c/mkfile
index b6230e70..72d041f3 100644
--- a/utils/5c/mkfile
+++ b/utils/5c/mkfile
@@ -32,7 +32,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: 5.out.h
# rc mkenam
diff --git a/utils/6c/mkfile b/utils/6c/mkfile
index e65e52bb..4f1803e6 100644
--- a/utils/6c/mkfile
+++ b/utils/6c/mkfile
@@ -37,7 +37,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: 6.out.h
# rc mkenam
diff --git a/utils/8c/mkfile b/utils/8c/mkfile
index 2bafc9ee..b0924ee0 100644
--- a/utils/8c/mkfile
+++ b/utils/8c/mkfile
@@ -37,7 +37,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: 8.out.h
# rc mkenam
diff --git a/utils/kc/mkfile b/utils/kc/mkfile
index 584143cd..8f12b028 100644
--- a/utils/kc/mkfile
+++ b/utils/kc/mkfile
@@ -34,7 +34,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: k.out.h
# rc mkenam
diff --git a/utils/qc/mkfile b/utils/qc/mkfile
index e24828eb..39330074 100644
--- a/utils/qc/mkfile
+++ b/utils/qc/mkfile
@@ -32,7 +32,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: q.out.h
# rc mkenam
diff --git a/utils/vc/mkfile b/utils/vc/mkfile
index 71adf1f4..9b65ab73 100644
--- a/utils/vc/mkfile
+++ b/utils/vc/mkfile
@@ -34,7 +34,7 @@ $ROOT/$OBJDIR/lib/libcc.a:
mk $MKFLAGS clean
%.$O: ../cc/%.c
- $CC $CFLAGS -I. ../cc/$stem.c
+ $CC -I. $CFLAGS ../cc/$stem.c
#enam.c: v.out.h
# rc mkenam