Commit ffb2a8c2 authored by ian@well-typed.com's avatar ian@well-typed.com

Rename $(Windows) to $(Windows_Host)

parent 45ee44d8
...@@ -35,7 +35,7 @@ test_bindist: ...@@ -35,7 +35,7 @@ test_bindist:
mkdir bindisttest/a/b/c mkdir bindisttest/a/b/c
cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf - cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion) $(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR) mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else else
cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) --with-gcc="$(WhatGccIsCalled)" cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) --with-gcc="$(WhatGccIsCalled)"
......
...@@ -10,7 +10,7 @@ ...@@ -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_C_SRCS = ghc.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghc_dist_CC_OPTS += -I driver/utils driver/ghc_dist_CC_OPTS += -I driver/utils
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifneq "$(Windows)" "YES" ifneq "$(Windows_Host)" "YES"
install: install_driver_ghci install: install_driver_ghci
...@@ -26,7 +26,7 @@ install_driver_ghci: ...@@ -26,7 +26,7 @@ install_driver_ghci:
$(call removeFiles,"$(DESTDIR)$(bindir)/ghci") $(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
$(LN_S) ghci-$(ProjectVersion) "$(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_C_SRCS = ghci.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghci_dist_CC_OPTS += -I driver/utils driver/ghci_dist_CC_OPTS += -I driver/utils
......
...@@ -10,7 +10,7 @@ ...@@ -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_C_SRCS = haddock.c ../utils/cwrapper.c ../utils/getLocation.c
driver/haddock_dist_CC_OPTS += -I driver/utils driver/haddock_dist_CC_OPTS += -I driver/utils
......
...@@ -350,7 +350,7 @@ else ...@@ -350,7 +350,7 @@ else
# compiler already has installed (or up-to-date enough). # compiler already has installed (or up-to-date enough).
PACKAGES_STAGE0 = Cabal/Cabal hpc bin-package-db hoopl transformers PACKAGES_STAGE0 = Cabal/Cabal hpc bin-package-db hoopl transformers
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE0 += terminfo PACKAGES_STAGE0 += terminfo
endif endif
...@@ -364,11 +364,11 @@ PACKAGES_STAGE1 += bytestring ...@@ -364,11 +364,11 @@ PACKAGES_STAGE1 += bytestring
PACKAGES_STAGE1 += containers PACKAGES_STAGE1 += containers
PACKAGES_STAGE1 += old-locale PACKAGES_STAGE1 += old-locale
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
PACKAGES_STAGE1 += Win32 PACKAGES_STAGE1 += Win32
endif endif
PACKAGES_STAGE1 += time PACKAGES_STAGE1 += time
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE1 += unix PACKAGES_STAGE1 += unix
endif endif
...@@ -397,7 +397,7 @@ endif ...@@ -397,7 +397,7 @@ endif
REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
PACKAGES_STAGE1 += xhtml PACKAGES_STAGE1 += xhtml
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE1 += terminfo PACKAGES_STAGE1 += terminfo
endif endif
PACKAGES_STAGE1 += haskeline PACKAGES_STAGE1 += haskeline
...@@ -566,7 +566,7 @@ BUILD_DIRS += \ ...@@ -566,7 +566,7 @@ BUILD_DIRS += \
$(GHC_MKDIRHIER_DIR) $(GHC_MKDIRHIER_DIR)
endif endif
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
BUILD_DIRS += \ BUILD_DIRS += \
$(GHC_TOUCHY_DIR) $(GHC_TOUCHY_DIR)
endif endif
...@@ -753,7 +753,7 @@ endif ...@@ -753,7 +753,7 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Creating a local mingw copy on Windows # Creating a local mingw copy on Windows
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
install : install_mingw install : install_mingw
.PHONY: install_mingw .PHONY: install_mingw
...@@ -765,7 +765,7 @@ install : install_perl ...@@ -765,7 +765,7 @@ install : install_perl
install_perl : $(INPLACE_PERL) install_perl : $(INPLACE_PERL)
"$(CP)" -Rp $(INPLACE_PERL) $(prefix) "$(CP)" -Rp $(INPLACE_PERL) $(prefix)
endif # Windows endif # Windows_Host
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
$(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \ $(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \
...@@ -870,7 +870,7 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d ...@@ -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. # Install packages in the right order, so that ghc-pkg doesn't complain.
# Also, install ghc-pkg first. # Also, install ghc-pkg first.
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
else else
......
...@@ -155,7 +155,7 @@ $(GHC_STAGE2) : | $(SPLIT) ...@@ -155,7 +155,7 @@ $(GHC_STAGE2) : | $(SPLIT)
$(GHC_STAGE3) : | $(SPLIT) $(GHC_STAGE3) : | $(SPLIT)
endif endif
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
$(GHC_STAGE1) : | $(TOUCHY) $(GHC_STAGE1) : | $(TOUCHY)
$(GHC_STAGE2) : | $(TOUCHY) $(GHC_STAGE2) : | $(TOUCHY)
$(GHC_STAGE3) : | $(TOUCHY) $(GHC_STAGE3) : | $(TOUCHY)
...@@ -165,7 +165,7 @@ endif ...@@ -165,7 +165,7 @@ endif
INSTALL_LIBS += settings INSTALL_LIBS += settings
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
install: install_ghc_link install: install_ghc_link
.PHONY: install_ghc_link .PHONY: install_ghc_link
install_ghc_link: install_ghc_link:
......
...@@ -128,11 +128,11 @@ LeadingUnderscore=@LeadingUnderscore@ ...@@ -128,11 +128,11 @@ LeadingUnderscore=@LeadingUnderscore@
exeext=@exeext@ exeext=@exeext@
soext=@soext@ soext=@soext@
# Windows=YES if on a Windows platform # Windows_Host=YES if on a Windows platform
ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" "" ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" ""
Windows=YES Windows_Host=YES
else else
Windows=NO Windows_Host=NO
endif endif
# Tell the build system what the host operating system is # Tell the build system what the host operating system is
......
...@@ -141,7 +141,7 @@ define addCFileDeps ...@@ -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 $(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 endef
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
CASE_INSENSITIVE_SED = i CASE_INSENSITIVE_SED = i
else else
CASE_INSENSITIVE_SED = CASE_INSENSITIVE_SED =
......
...@@ -54,7 +54,7 @@ ifeq "$$($1_USES_CABAL)" "YES" ...@@ -54,7 +54,7 @@ ifeq "$$($1_USES_CABAL)" "YES"
$1_$2_USES_CABAL = YES $1_$2_USES_CABAL = YES
endif endif
ifeq "$$(Windows)" "YES" ifeq "$$(Windows_Host)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = NO $1_$2_WANT_INPLACE_WRAPPER = NO
else ifneq "$$($1_$2_INSTALL_INPLACE)" "YES" else ifneq "$$($1_$2_INSTALL_INPLACE)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = NO $1_$2_WANT_INPLACE_WRAPPER = NO
...@@ -66,7 +66,7 @@ else ...@@ -66,7 +66,7 @@ else
$1_$2_WANT_INPLACE_WRAPPER = NO $1_$2_WANT_INPLACE_WRAPPER = NO
endif endif
ifeq "$$(Windows)" "YES" ifeq "$$(Windows_Host)" "YES"
$1_$2_WANT_INSTALLED_WRAPPER = NO $1_$2_WANT_INSTALLED_WRAPPER = NO
else ifneq "$$($1_$2_INSTALL)" "YES" else ifneq "$$($1_$2_INSTALL)" "YES"
$1_$2_WANT_INSTALLED_WRAPPER = NO $1_$2_WANT_INSTALLED_WRAPPER = NO
......
...@@ -75,7 +75,7 @@ endif ...@@ -75,7 +75,7 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Link ghc-pkg to ghc-pkg-$(ProjectVersion) when installing # Link ghc-pkg to ghc-pkg-$(ProjectVersion) when installing
ifeq "$(Windows)" "NO" ifeq "$(Windows_Host)" "NO"
install: install_utils/ghc-pkg_link install: install_utils/ghc-pkg_link
.PHONY: install_utils/ghc-pkg_link .PHONY: install_utils/ghc-pkg_link
......
...@@ -30,7 +30,7 @@ $(eval $(call build-prog,utils/runghc,dist-install,1)) ...@@ -30,7 +30,7 @@ $(eval $(call build-prog,utils/runghc,dist-install,1))
install: install_runhaskell install: install_runhaskell
.PHONY: install_runhaskell .PHONY: install_runhaskell
ifeq "$(Windows)" "YES" ifeq "$(Windows_Host)" "YES"
install_runhaskell: install_bins install_runhaskell: install_bins
"$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext) "$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext)
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment