[commit: ghc] master: Rename $(Windows) to $(Windows_Host) (ffb2a8c)
Ian Lynagh
igloo at earth.li
Sat Mar 2 00:35:51 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ffb2a8c216ad8791422008cc92c8048f4528bbf4
>---------------------------------------------------------------
commit ffb2a8c216ad8791422008cc92c8048f4528bbf4
Author: Ian Lynagh <ian at well-typed.com>
Date: Fri Mar 1 21:46:02 2013 +0000
Rename $(Windows) to $(Windows_Host)
>---------------------------------------------------------------
bindisttest/ghc.mk | 2 +-
driver/ghc/ghc.mk | 2 +-
driver/ghci/ghc.mk | 4 ++--
driver/haddock/ghc.mk | 2 +-
ghc.mk | 16 ++++++++--------
ghc/ghc.mk | 4 ++--
mk/project.mk.in | 6 +++---
rules/build-dependencies.mk | 2 +-
rules/build-prog.mk | 4 ++--
utils/ghc-pkg/ghc.mk | 2 +-
utils/runghc/ghc.mk | 2 +-
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index c911da5..322b197 100644
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
@@ -35,7 +35,7 @@ test_bindist:
mkdir bindisttest/a/b/c
cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else
cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) --with-gcc="$(WhatGccIsCalled)"
diff --git a/driver/ghc/ghc.mk b/driver/ghc/ghc.mk
index 688a3f6..dee9d57 100644
--- a/driver/ghc/ghc.mk
+++ b/driver/ghc/ghc.mk
@@ -10,7 +10,7 @@
#
# -----------------------------------------------------------------------------
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
driver/ghc_dist_C_SRCS = ghc.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghc_dist_CC_OPTS += -I driver/utils
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 4b41849..ad11ee1 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -10,7 +10,7 @@
#
# -----------------------------------------------------------------------------
-ifneq "$(Windows)" "YES"
+ifneq "$(Windows_Host)" "YES"
install: install_driver_ghci
@@ -26,7 +26,7 @@ install_driver_ghci:
$(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
$(LN_S) ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghci"
-else # Windows...
+else # Windows_Host...
driver/ghci_dist_C_SRCS = ghci.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghci_dist_CC_OPTS += -I driver/utils
diff --git a/driver/haddock/ghc.mk b/driver/haddock/ghc.mk
index f95559c..06a6cec 100644
--- a/driver/haddock/ghc.mk
+++ b/driver/haddock/ghc.mk
@@ -10,7 +10,7 @@
#
# -----------------------------------------------------------------------------
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
driver/haddock_dist_C_SRCS = haddock.c ../utils/cwrapper.c ../utils/getLocation.c
driver/haddock_dist_CC_OPTS += -I driver/utils
diff --git a/ghc.mk b/ghc.mk
index a4be8c4..1cf5f86 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -350,7 +350,7 @@ else
# compiler already has installed (or up-to-date enough).
PACKAGES_STAGE0 = Cabal/Cabal hpc bin-package-db hoopl transformers
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE0 += terminfo
endif
@@ -364,11 +364,11 @@ PACKAGES_STAGE1 += bytestring
PACKAGES_STAGE1 += containers
PACKAGES_STAGE1 += old-locale
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
PACKAGES_STAGE1 += Win32
endif
PACKAGES_STAGE1 += time
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE1 += unix
endif
@@ -397,7 +397,7 @@ endif
REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
PACKAGES_STAGE1 += xhtml
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE1 += terminfo
endif
PACKAGES_STAGE1 += haskeline
@@ -566,7 +566,7 @@ BUILD_DIRS += \
$(GHC_MKDIRHIER_DIR)
endif
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
BUILD_DIRS += \
$(GHC_TOUCHY_DIR)
endif
@@ -753,7 +753,7 @@ endif
# -----------------------------------------------------------------------------
# Creating a local mingw copy on Windows
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
install : install_mingw
.PHONY: install_mingw
@@ -765,7 +765,7 @@ install : install_perl
install_perl : $(INPLACE_PERL)
"$(CP)" -Rp $(INPLACE_PERL) $(prefix)
-endif # Windows
+endif # Windows_Host
ifneq "$(BINDIST)" "YES"
$(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \
@@ -870,7 +870,7 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
# Install packages in the right order, so that ghc-pkg doesn't complain.
# Also, install ghc-pkg first.
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
else
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 5c37115..13a3e54 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -155,7 +155,7 @@ $(GHC_STAGE2) : | $(SPLIT)
$(GHC_STAGE3) : | $(SPLIT)
endif
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
$(GHC_STAGE1) : | $(TOUCHY)
$(GHC_STAGE2) : | $(TOUCHY)
$(GHC_STAGE3) : | $(TOUCHY)
@@ -165,7 +165,7 @@ endif
INSTALL_LIBS += settings
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
install: install_ghc_link
.PHONY: install_ghc_link
install_ghc_link:
diff --git a/mk/project.mk.in b/mk/project.mk.in
index 3625124..df845c6 100644
--- a/mk/project.mk.in
+++ b/mk/project.mk.in
@@ -128,11 +128,11 @@ LeadingUnderscore=@LeadingUnderscore@
exeext=@exeext@
soext=@soext@
-# Windows=YES if on a Windows platform
+# Windows_Host=YES if on a Windows platform
ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" ""
-Windows=YES
+Windows_Host=YES
else
-Windows=NO
+Windows_Host=NO
endif
# Tell the build system what the host operating system is
diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 7b66dcd..7bbb8c5 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -141,7 +141,7 @@ define addCFileDeps
$(foreach w,$5,sed -e 's|\\|/|g' -e 's| /$$| \\|' -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|$(TOP)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true
endef
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
CASE_INSENSITIVE_SED = i
else
CASE_INSENSITIVE_SED =
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 3cea0e4..7fbe789 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -54,7 +54,7 @@ ifeq "$$($1_USES_CABAL)" "YES"
$1_$2_USES_CABAL = YES
endif
-ifeq "$$(Windows)" "YES"
+ifeq "$$(Windows_Host)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = NO
else ifneq "$$($1_$2_INSTALL_INPLACE)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = NO
@@ -66,7 +66,7 @@ else
$1_$2_WANT_INPLACE_WRAPPER = NO
endif
-ifeq "$$(Windows)" "YES"
+ifeq "$$(Windows_Host)" "YES"
$1_$2_WANT_INSTALLED_WRAPPER = NO
else ifneq "$$($1_$2_INSTALL)" "YES"
$1_$2_WANT_INSTALLED_WRAPPER = NO
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index a179ae7..e209491 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -75,7 +75,7 @@ endif
# -----------------------------------------------------------------------------
# Link ghc-pkg to ghc-pkg-$(ProjectVersion) when installing
-ifeq "$(Windows)" "NO"
+ifeq "$(Windows_Host)" "NO"
install: install_utils/ghc-pkg_link
.PHONY: install_utils/ghc-pkg_link
diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index 0c045b4..a181938 100644
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -30,7 +30,7 @@ $(eval $(call build-prog,utils/runghc,dist-install,1))
install: install_runhaskell
.PHONY: install_runhaskell
-ifeq "$(Windows)" "YES"
+ifeq "$(Windows_Host)" "YES"
install_runhaskell: install_bins
"$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext)
else
More information about the ghc-commits
mailing list