[commit: ghc] master: `--via-asm` only for windows targets (f6cf400)

git at git.haskell.org git at git.haskell.org
Tue Mar 6 01:26:15 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f6cf4001574e789865d25f89b362a04ef1ca3df4/ghc

>---------------------------------------------------------------

commit f6cf4001574e789865d25f89b362a04ef1ca3df4
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Mar 5 17:18:25 2018 +0800

    `--via-asm` only for windows targets
    
    Reviewers: trofi, bgamari
    
    Reviewed By: trofi, bgamari
    
    Subscribers: rwbarton, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4467


>---------------------------------------------------------------

f6cf4001574e789865d25f89b362a04ef1ca3df4
 mk/config.mk.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 26b07f3..92830fa 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -649,12 +649,16 @@ $(eval $(call set_stage_HSC2HS_OPTS,0))
 $(eval $(call set_stage_HSC2HS_OPTS,1))
 $(eval $(call set_stage_HSC2HS_OPTS,2))
 ifeq "$(CrossCompiling)" "YES"
+SRC_HSC2HS_OPTS_STAGE1 += --cross-compile
+SRC_HSC2HS_OPTS_STAGE2 += --cross-compile
+ifeq "$(Windows_Target)" "YES"
 # We'll assume we compile with gcc or clang, and both support `-S` and can as such use the
 # --via-asm pass, which should be faster and is required for cross compiling to windows, as
 # the c compiler complains about non-constant expressions even though they are constant and
 # end up as constants in the assembly.
-SRC_HSC2HS_OPTS_STAGE1 += --cross-compile --via-asm
-SRC_HSC2HS_OPTS_STAGE2 += --cross-compile --via-asm
+SRC_HSC2HS_OPTS_STAGE1 += --via-asm
+SRC_HSC2HS_OPTS_STAGE2 += --via-asm
+endif
 endif
 SRC_HSC2HS_OPTS_STAGE0 += --cflag=-D$(HostArch_CPP)_HOST_ARCH --cflag=-D$(HostOS_CPP)_HOST_OS
 SRC_HSC2HS_OPTS_STAGE1 += --cflag=-D$(TargetArch_CPP)_HOST_ARCH --cflag=-D$(TargetOS_CPP)_HOST_OS



More information about the ghc-commits mailing list