diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-03-13 20:38:13 +0000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-03-17 08:39:23 +1100 |
| commit | 83afcd174cdbf4fb770371da764f91ca9ad414a7 (patch) | |
| tree | ce6435dca5943355acd067c5ed0770ab7ee73dd8 /mk | |
| parent | 5166ee94e439375a4e6acb80f88ec6ee65476bbd (diff) | |
| download | haskell-83afcd174cdbf4fb770371da764f91ca9ad414a7.tar.gz | |
Fix build on amd64/solaris.
Summary:
Commit 71fcc4c096ec0 breaks the 64bit build on Solaris 11. Solaris
is a multi-lib OS so both 32bit and 64bit binaries may be run, but
by default it compiles to 32bit so that -m64 needs to be added in
the appropriate place when compiling for 64 bits.
Patch-from: Karel Gardas <karel.gardas@centrum.cz>
Reviewers: kgardas, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D733
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index a6f757aa51..b32f227f08 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -568,6 +568,7 @@ define set_stage_HSC2HS_OPTS # $1 = stage SRC_HSC2HS_OPTS_STAGE$1 += $$(addprefix --cflag=,$$(filter-out -O,$$(SRC_CC_OPTS) $$(CONF_CC_OPTS_STAGE$1))) SRC_HSC2HS_OPTS_STAGE$1 += $$(addprefix --cflag=,$$(CONF_CPP_OPTS_STAGE$1)) +SRC_HSC2HS_OPTS_STAGE$1 += $$(addprefix --lflag=,$$(CONF_GCC_LINKER_OPTS_STAGE$1)) endef $(eval $(call set_stage_HSC2HS_OPTS,0)) $(eval $(call set_stage_HSC2HS_OPTS,1)) |