Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
ffb2a8c2
Commit
ffb2a8c2
authored
Mar 01, 2013
by
ian@well-typed.com
Browse files
Rename $(Windows) to $(Windows_Host)
parent
45ee44d8
Changes
11
Hide whitespace changes
Inline
Side-by-side
bindisttest/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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)
"
...
...
driver/ghc/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
driver/ghci/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
driver/haddock/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
ghc/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
:
...
...
mk/project.mk.in
View file @
ffb2a8c2
...
...
@@ -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
...
...
rules/build-dependencies.mk
View file @
ffb2a8c2
...
...
@@ -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
=
...
...
rules/build-prog.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
utils/ghc-pkg/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
utils/runghc/ghc.mk
View file @
ffb2a8c2
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment