File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed
Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -483,8 +483,11 @@ node-api.o: node-api.cc
483483
484484$(EXES ) :
485485
486+ $(warning $(CPLUSPLUS) , $(COMPILER))
487+
488+
486489tests : $(EXES )
487- cd test ; $(MAKE )
490+ cd test ; $(MAKE ) $( MAKEOVERRIDES )
488491
489492BASIC_CLEAN =rm -rf *.o *~ "\# *\#" core *.d *.cd *.rcd *.tcd *.xcd *.gcda *.gcno *.so *.dll *.dylib
490493
Original file line number Diff line number Diff line change @@ -4,10 +4,16 @@ DEBUG=1
44ECOLAB_HOME =../ecolab
55
66ifneq ($(MAKECMDGOALS ) ,clean)
7+ ifneq ($(COMPILER ) ,"")
8+ # rewrite CPLUSPLUS after clobber in Makefile
9+ CPLUSPLUS: =$(COMPILER )
10+ $(warning $(CPLUSPLUS) , $(COMPILER))
11+ endif
712include $(ECOLAB_HOME ) /include/Makefile
813ifneq ($(COMPILER ) ,"")
914# rewrite CPLUSPLUS after clobber in Makefile
1015CPLUSPLUS =$(COMPILER )
16+ $(warning $(COMPILER))
1117endif
1218endif
1319
You can’t perform that action at this time.
0 commit comments