diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T15·47+0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T15·47+0000 |
| commit | ffdc85fc8afba0828bd1f300fdb4f68de99d7000 (patch) | |
| tree | 1e92dd09c66f82f236d39220e74bf652412746f5 | |
| parent | 62e35cc3a893e3bc4ed1fe2a37ba67af9859b4cb (diff) | |
Respect configure flags
| -rw-r--r-- | Makefile.config.in | 4 | ||||
| -rw-r--r-- | Makefile.lib | 4 | ||||
| -rw-r--r-- | Makefile.new | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 25e537bcca07..e5a6f4c68d8b 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -1,3 +1,7 @@ +CC = @CC@ +CFLAGS = @CFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ bindir = @bindir@ diff --git a/Makefile.lib b/Makefile.lib index c7880ff11421..449f19ad506f 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -5,10 +5,10 @@ here = $(dir $(lastword $(MAKEFILE_LIST))) QUIET = @ %.o: %.cc - $(QUIET) g++ -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CXX) -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP %.o: %.c - $(QUIET) gcc -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP + $(QUIET) $(CC) -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP # Generate Make rules for libraries. diff --git a/Makefile.new b/Makefile.new index 566f1f7be5dd..8911d6d72c40 100644 --- a/Makefile.new +++ b/Makefile.new @@ -12,9 +12,7 @@ include src/nix-instantiate/Makefile.new include src/nix-env/Makefile.new include src/nix-daemon/Makefile.new -CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr - -CFLAGS = +CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr $(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog)))) |