diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-20 14:16:27 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-20 17:10:10 +0100 |
| commit | 1e2e0132eb7c80531e435971d036e8eb3ab93645 (patch) | |
| tree | ab890313f18f88116528b81a8a92c5028d52761b /libraries/integer-gmp/gmp | |
| parent | 0e1b9bd44903493a9716e0f8e6c6a801884a7fea (diff) | |
| download | haskell-1e2e0132eb7c80531e435971d036e8eb3ab93645.tar.gz | |
Build system refactoring
Diffstat (limited to 'libraries/integer-gmp/gmp')
| -rw-r--r-- | libraries/integer-gmp/gmp/ghc.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk index d98eb8e4f1..54b6d089f7 100644 --- a/libraries/integer-gmp/gmp/ghc.mk +++ b/libraries/integer-gmp/gmp/ghc.mk @@ -49,14 +49,10 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" include libraries/integer-gmp/gmp/config.mk endif -libraries/integer-gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS)) -libraries/integer-gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS)) +libraries/integer-gmp_dist-install_EXTRA_HC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist -libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext): libraries/integer-gmp/cbits/mkGmpDerivedConstants.c - "$(CC_STAGE1)" $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) $(libraries/integer-gmp_CC_OPTS) $< -o $@ - -libraries/integer-gmp/cbits/GmpDerivedConstants.h: libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext) - $< > $@ +gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS)) +gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS)) # Compile GMP only if we don't have it already # @@ -82,8 +78,8 @@ endif endif define GmpDerivedConstants-dependencies # args: $1 = way -$$(libraries/integer-gmp_dist-install_$1_CMM_OBJS): libraries/integer-gmp/cbits/GmpDerivedConstants.h -$$(libraries/integer-gmp_dist-install_$1_C_OBJS): libraries/integer-gmp/cbits/GmpDerivedConstants.h +$$(libraries/integer-gmp_dist-install_$1_CMM_OBJS): $$$$(GmpDerivedConstants_HEADER) +$$(libraries/integer-gmp_dist-install_$1_C_OBJS): $$$$(GmpDerivedConstants_HEADER) endef $(foreach w,$(GhcLibWays),$(eval $(call GmpDerivedConstants-dependencies,$w))) @@ -92,9 +88,8 @@ ifneq "$(HaveLibGmp)" "YES" ifneq "$(HaveFrameworkGMP)" "YES" $(libraries/integer-gmp_dist-install_depfile_c_asm): libraries/integer-gmp/gmp/gmp.h -libraries/integer-gmp/cbits/mkGmpDerivedConstants$(exeext): libraries/integer-gmp/gmp/gmp.h - -libraries/integer-gmp_CC_OPTS += -I$(TOP)/libraries/integer-gmp/gmp +gmp_CC_OPTS += -Ilibraries/integer-gmp/gmp +gmp_CC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist libraries/integer-gmp_dist-install_EXTRA_OBJS += libraries/integer-gmp/gmp/objs/*.o @@ -110,6 +105,8 @@ libraries/integer-gmp_dist-install_EXTRA_OBJS += libraries/integer-gmp/gmp/objs/ endif endif +libraries/integer-gmp_dist-install_EXTRA_CC_OPTS += $(gmp_CC_OPTS) + # 2007-09-26 # set -o igncr # is not a valid command on non-Cygwin-systems. |