[commit: ghc] master: Follow Windows -> Windows_Host change in config.mk.in (535964b)
Ian Lynagh
igloo at earth.li
Sat Mar 2 03:46:55 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/535964b1923f9f8df52adaef014441bc454ebf9b
>---------------------------------------------------------------
commit 535964b1923f9f8df52adaef014441bc454ebf9b
Author: Ian Lynagh <ian at well-typed.com>
Date: Sat Mar 2 02:03:34 2013 +0000
Follow Windows -> Windows_Host change in config.mk.in
>---------------------------------------------------------------
mk/config.mk.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index c199cc8..fe88624 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -195,7 +195,7 @@ endif
# On Windows we normally want to make a relocatable bindist, to we
# ignore flags like libdir
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
RelocatableBuild = YES
else
RelocatableBuild = NO
@@ -587,7 +587,7 @@ endif
# The .hsc files aren't currently safe for cross-compilation on Windows:
# libraries\haskeline\.\System\Console\Haskeline\Backend\Win32.hsc:160
# directive "let" is not safe for cross-compilation
-ifneq "$(Windows)" "YES"
+ifneq "$(Windows_Host)" "YES"
SRC_HSC2HS_OPTS += --cross-safe
endif
SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE0)))
@@ -703,7 +703,7 @@ LdHasNoCompactUnwind = @LdHasNoCompactUnwind@
# xargs: value for -s option should be < 28153
# so we now use 20000 to be comfortably below this bound
XARGS = xargs
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
XARGS_OPTS = -s 20000
endif
@@ -741,7 +741,7 @@ TAR_CMD = @TarCmd@
BZIP2_CMD = bzip2
GZIP_CMD = gzip
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
TOUCH_CMD = $(utils/touchy_dist_INPLACE)
TOUCH_DEP = $(TOUCH_CMD)
else
More information about the ghc-commits
mailing list