commit ca77a17992c925b16bf0764b4ea9fcca6066f065
Author: Lucas Gabriel Vuotto <[email protected]>
AuthorDate: Wed Jun 15 13:48:51 2016 -0300
Commit: Quentin Rameau <[email protected]>
CommitDate: Wed Jun 15 18:59:38 2016 +0200
Remove MAKEFLAGS use in Makefiles
Per POSIX, "Macros are not exported to the environment of commands to be
run. This was never the case in any historical make and would have
serious consequences. The environment is the same as the environment to
make except that MAKEFLAGS and macros defined on the make command line
are added.", so there is no need to use MAKEFLAGS at all in these cases.
Signed-off-by: Lucas Gabriel Vuotto <[email protected]>
diff --git a/Makefile b/Makefile
index 48b5282..7148f69 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ARCHS = z80 i386-sysv amd64-sysv qbe
all:
for i in $(DIRS); \
do \
- (cd $$i && $(MAKE) -e -$(MAKEFLAGS)); \
+ (cd $$i && $(MAKE) -e); \
done
cp -f cc1/cc1 bin/cc1
cp -f cc2/cc2 bin/cc2
@@ -19,14 +19,14 @@ all:
multi:
for i in $(ARCHS); \
do \
- $(MAKE) -$(MAKEFLAGS) $$i || exit; \
+ $(MAKE) $$i || exit; \
done
$(ARCHS):
for i in cc1 cc2; \
do \
(cd $$i; \
- ARCH=$@ $(MAKE) -e -$(MAKEFLAGS) clean; \
+ ARCH=$@ $(MAKE) -e clean; \
ARCH=$@ $(MAKE) -e $$i || exit); \
done
ln -f cc1/cc1 bin/cc1-$@
@@ -49,13 +49,13 @@ uninstall:
clean:
for i in $(DIRS); \
do \
- (cd $$i && $(MAKE) -$(MAKEFLAGS) $@ || exit); \
+ (cd $$i && $(MAKE) $@ || exit); \
done
multi-clean:
for i in $(ARCHS); \
do \
- ARCH=$$i $(MAKE) -e -$(MAKEFLAGS) clean || exit; \
+ ARCH=$$i $(MAKE) -e clean || exit; \
done
distclean: multi-clean
diff --git a/cc1/Makefile b/cc1/Makefile
index 1cfc5c3..80e5470 100644
--- a/cc1/Makefile
+++ b/cc1/Makefile
@@ -14,7 +14,7 @@ all: cc1
$(OBJS): cc1.h ../inc/cc.h ../inc/sizes.h arch/$(ARCH)/arch.h
../lib/libcc.a:
- cd ../lib && $(MAKE) -e -$(MAKEFLAGS)
+ cd ../lib && $(MAKE) -e
cc1: $(OBJS) ../lib/libcc.a
$(CC) $(SCC_LDFLAGS) $(OBJS) ../lib/libcc.a -o $@
diff --git a/cc2/Makefile b/cc2/Makefile
index 62e58d0..c6ed72e 100644
--- a/cc2/Makefile
+++ b/cc2/Makefile
@@ -21,7 +21,7 @@ main.o: error.h
$(OBJS): cc2.h ../inc/sizes.h
../lib/libcc.a:
- cd ../lib && $(MAKE) -e -$(MAKEFLAGS)
+ cd ../lib && $(MAKE) -e
cc2: $(OBJS) ../lib/libcc.a
$(CC) $(SCC_LDFLAGS) $(OBJS) ../lib/libcc.a -o $@
diff --git a/driver/posix/Makefile b/driver/posix/Makefile
index 5012890..91b1532 100644
--- a/driver/posix/Makefile
+++ b/driver/posix/Makefile
@@ -10,7 +10,7 @@ all: scc
$(OBJS): ../../inc/cc.h
../../lib/libcc.a:
- cd ../../lib && $(MAKE) -e -$(MAKEFLAGS)
+ cd ../../lib && $(MAKE) -e
scc: $(OBJS) ../../lib/libcc.a
$(CC) $(SCC_LDFLAGS) $(OBJS) ../../lib/libcc.a -o $@
