diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 11:36:44 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-20 12:35:52 +0200 |
| commit | b6be81b841e34ca45b3549c4c79e886a8761e59a (patch) | |
| tree | d90ff31ecf839f756268a715abe97bf5d6797e17 /rules/distdir-opts.mk | |
| parent | d97e60f5dfab102127b6fa4a5277084815136fc7 (diff) | |
| download | haskell-b6be81b841e34ca45b3549c4c79e886a8761e59a.tar.gz | |
Build system: delete half-baked Cygwin support
We only support building GHC on mys2 nowadays, see
https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Windows.
This (partially) reverts various commits from a few years ago, among which:
* 5775d5142da227d65fb86994d363eb16841ee642
"Add OSTYPE build-system variable, and use it"
* 3fb8c431824aa2f3bd979e35d1a283546fcfbe74
"Fix building libgmp on cygwin"
* cdbb4720c424500adb57cbbef69721d0b039fa46
"Fix cmd invocation by libffi cuild system on Windows 7 cygwin"
* e8121501ee3549a35e954726ccfd871ac9d51f83
"Fix dblatex and xml* tool detection on Windows"
Reviewed by: austin, Phyx
Differential Revision: https://phabricator.haskell.org/D1155
Diffstat (limited to 'rules/distdir-opts.mk')
| -rw-r--r-- | rules/distdir-opts.mk | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk index b2f0d1b9ff..e411559b59 100644 --- a/rules/distdir-opts.mk +++ b/rules/distdir-opts.mk @@ -19,24 +19,8 @@ ifeq "$3" "" $$(error Stage not given for distdir-opts $1 $2) endif -ifeq "$3" "0" -# This is a bit of a hack. -# If we are compiling something with the bootstrapping compiler on -# cygwin, and it uses an include file from the rts (say), then we -# need to stop mkdependC from generating a dependincy on -# c:/ghc/rts/include/Rts.h -# as that confuses make. So we use -isystem instead of -I, which stops -# these dependencies from being generated. Technically this is wrong if -# we depend on a library that is built inside the build tree, and we -# use headers from that library, but currently I don't think that's the -# case. -$1_$2_DEP_INCLUDE_DIRS_FLAG = -isystem -else -$1_$2_DEP_INCLUDE_DIRS_FLAG = -I -endif - ifneq ($$(strip $$($1_$2_DEP_INCLUDE_DIRS_SINGLE_QUOTED)),) -$1_$2_CC_INC_FLAGS := $$(subst $$(space)',$$(space)$$($1_$2_DEP_INCLUDE_DIRS_FLAG)',$$(space)$$($1_$2_DEP_INCLUDE_DIRS_SINGLE_QUOTED)) +$1_$2_CC_INC_FLAGS := $$(subst $$(space)',$$(space)-I',$$(space)$$($1_$2_DEP_INCLUDE_DIRS_SINGLE_QUOTED)) endif # The CONF_CC_OPTS_STAGE$3 options are what we use to get gcc to |