summaryrefslogtreecommitdiff
path: root/rules/distdir-opts.mk
diff options
context:
space:
mode:
Diffstat (limited to 'rules/distdir-opts.mk')
-rw-r--r--rules/distdir-opts.mk18
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