picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Respect configure flags

This commit is contained in:
Eelco Dolstra 2013-11-22 15:47:47 +00:00
parent 62e35cc3a8
commit ffdc85fc8a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.config.in
View File

@ -1,3 +1,7 @@
CC = @CC@
CFLAGS = @CFLAGS@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
bindir = @bindir@

4
Makefile.lib
View File

@ -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.

4
Makefile.new
View File

@ -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))))