diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-24 23:31:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-24 23:31:21 +0000 |
| commit | 001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e (patch) | |
| tree | 303f900a56d5f00b6e4eaba44a75a49796905813 /rules | |
| parent | 77b29b5685db2f8745d191af1599ed753bef91e7 (diff) | |
| download | haskell-001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e.tar.gz | |
Keep separate linker flags, for when we want to link with gcc or ld
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/distdir-way-opts.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 3392d904d0..dcffee6110 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -40,7 +40,7 @@ endif # for a feature it may not generate warning-free C code, and thus may # think that the feature doesn't exist if -Werror is on. $1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)" -$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_LD_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" +$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_GCC_LINKER_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" $1_$2_CONFIGURE_OPTS += --configure-option=CPPFLAGS="$$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_OPTS)" ifneq "$$(ICONV_INCLUDE_DIRS)" "" diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 7a83f50c2e..bd09ad1528 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -109,7 +109,7 @@ $1_$2_DIST_LD_LIB_DIRS:=$$(shell for i in $$($1_$2_DEP_LIB_DIRS); do echo \"-L$$ endif $1_$2_DIST_LD_OPTS = \ - $$(CONF_LD_OPTS_STAGE$4) \ + $$(CONF_GCC_LINKER_OPTS_STAGE$4) \ $$(SRC_LD_OPTS) \ $$($1_LD_OPTS) \ $$($1_$2_LD_OPTS) \ |