Skip to content
Snippets Groups Projects
Commit f7febe89 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

MERGED: Pass GMP paths when compiling mkGmpDerivedConstants; fixes trac #3784 

Ian Lynagh <igloo@earth.li>**20100118191831
parent c371a9b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gmp/config.mk.in
+ 4
− 0
View file @ f7febe89
...@@ -5,3 +5,7 @@ endif ...@@ -5,3 +5,7 @@ endif
ifeq "$(HaveFrameworkGMP)" "" ifeq "$(HaveFrameworkGMP)" ""
HaveFrameworkGMP = @HaveFrameworkGMP@ HaveFrameworkGMP = @HaveFrameworkGMP@
endif endif
GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
GMP_LIB_DIRS = @GMP_LIB_DIRS@
gmp/ghc.mk
+ 3
− 0
View file @ f7febe89
...@@ -16,6 +16,9 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ...@@ -16,6 +16,9 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
include libraries/integer-gmp/gmp/config.mk include libraries/integer-gmp/gmp/config.mk
endif endif
libraries/integer-gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
libraries/integer-gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS))
libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext): libraries/integer-gmp/cbits/mkGmpDerivedConstants.c libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext): libraries/integer-gmp/cbits/mkGmpDerivedConstants.c
"$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) $(libraries/integer-gmp_CC_OPTS) $< -o $@ "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) $(libraries/integer-gmp_CC_OPTS) $< -o $@
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment