Skip to content

Commit 86d0dd2

Browse files
Pass MAKEOVERRIDES to test directory.
1 parent 7ee5fd1 commit 86d0dd2

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,11 @@ node-api.o: node-api.cc
483483

484484
$(EXES):
485485

486+
$(warning $(CPLUSPLUS) , $(COMPILER))
487+
488+
486489
tests: $(EXES)
487-
cd test; $(MAKE)
490+
cd test; $(MAKE) $(MAKEOVERRIDES)
488491

489492
BASIC_CLEAN=rm -rf *.o *~ "\#*\#" core *.d *.cd *.rcd *.tcd *.xcd *.gcda *.gcno *.so *.dll *.dylib
490493

test/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ DEBUG=1
44
ECOLAB_HOME=../ecolab
55

66
ifneq ($(MAKECMDGOALS),clean)
7+
ifneq ($(COMPILER),"")
8+
# rewrite CPLUSPLUS after clobber in Makefile
9+
CPLUSPLUS:=$(COMPILER)
10+
$(warning $(CPLUSPLUS) , $(COMPILER))
11+
endif
712
include $(ECOLAB_HOME)/include/Makefile
813
ifneq ($(COMPILER),"")
914
# rewrite CPLUSPLUS after clobber in Makefile
1015
CPLUSPLUS=$(COMPILER)
16+
$(warning $(COMPILER))
1117
endif
1218
endif
1319

0 commit comments

Comments
 (0)