diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-09-08 15:19:08 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-09-08 15:19:08 +0000 |
| commit | 93cd31711eea3dc9aa2ef8995e8ba054dabd87f0 (patch) | |
| tree | c65fde198db97373fefbfe222d9462b9b952cb12 /rules/distdir-opts.mk | |
| parent | 03bb97e0a29fe3f414c17e6b4074f2c9e8e8012e (diff) | |
| download | haskell-93cd31711eea3dc9aa2ef8995e8ba054dabd87f0.tar.gz | |
add $(CONF_*_OPTS) for options that come from ./configure (fixes #3426)
Diffstat (limited to 'rules/distdir-opts.mk')
| -rw-r--r-- | rules/distdir-opts.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk index a2dedb0bf5..5265efcf14 100644 --- a/rules/distdir-opts.mk +++ b/rules/distdir-opts.mk @@ -32,7 +32,8 @@ else $1_$2_DEP_INCLUDE_DIRS_FLAG = -I endif -$1_$2_BUILD_CC_OPTS = \ +$1_$2_DIST_CC_OPTS = \ + $$(CONF_CC_OPTS) \ $$(SRC_CC_OPTS) \ $$($1_CC_OPTS) \ $$(foreach dir,$$(filter-out /%,$$($1_$2_INCLUDE_DIRS)),-I$1/$$(dir)) \ @@ -42,7 +43,8 @@ $1_$2_BUILD_CC_OPTS = \ $$(foreach dir,$$($1_$2_DEP_INCLUDE_DIRS),$$($1_$2_DEP_INCLUDE_DIRS_FLAG)$$(dir)) \ $$($1_$2_DEP_CC_OPTS) -$1_$2_BUILD_LD_OPTS = \ +$1_$2_DIST_LD_OPTS = \ + $$(CONF_LD_OPTS) \ $$(SRC_LD_OPTS) \ $$($1_LD_OPTS) \ $$($1_$2_LD_OPTS) \ @@ -51,7 +53,8 @@ $1_$2_BUILD_LD_OPTS = \ $$($1_$2_DEP_LD_OPTS) # c.f. Cabal's Distribution.Simple.GHC.ghcOptions -$1_$2_BUILD_HC_OPTS = \ +$1_$2_DIST_HC_OPTS = \ + $$(CONF_HC_OPTS) \ $$(SRC_HC_OPTS) \ $$($1_HC_OPTS) \ $$($1_$2_HC_PKGCONF) \ |