diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-11-11 05:36:50 +0000 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-15 10:18:32 -0500 |
commit | 25d36c3178945d926f936ee32e57894d1743063c (patch) | |
tree | 9b1e21bcbb3be1775af7d608e10ea4fd322144ff /rts | |
parent | 3e5f0595eaa732fdbf1c273194280105bb5bd862 (diff) | |
download | haskell-25d36c3178945d926f936ee32e57894d1743063c.tar.gz |
Make: Get rid of GHC_INCLUDE_DIRS
These dirs should not be included in all stages. Instead make the
per-stage `BUILD_*_INCLUDE_DIR` "plural" to insert `rts/include` in the
right place.
Diffstat (limited to 'rts')
-rw-r--r-- | rts/ghc.mk | 6 | ||||
-rw-r--r-- | rts/include/ghc.mk | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 3643e07e9e..211741a2a9 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -214,8 +214,7 @@ rts_$1_DTRACE_OBJS = rts/dist-install/build/RtsProbes.$$($1_osuf) $$(rts_$1_DTRACE_OBJS) : $$(rts_$1_OBJS) $(DTRACE) -G -C \ - $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) \ - -I$$(BUILD_1_INCLUDE_DIR) \ + $$(addprefix -I,$$(BUILD_1_INCLUDE_DIRS)) \ -DDTRACE -s rts/RtsProbes.d \ -o $$@ \ $$(rts_$1_OBJS) @@ -379,8 +378,7 @@ WARNING_OPTS += -Wno-aggregate-return # WARNING_OPTS += -Wcast-align STANDARD_OPTS += \ - $(addprefix -I,$(GHC_INCLUDE_DIRS)) \ - -I$(BUILD_1_INCLUDE_DIR) \ + $(addprefix -I,$(BUILD_1_INCLUDE_DIRS)) \ -Irts \ -Irts/dist-install/build diff --git a/rts/include/ghc.mk b/rts/include/ghc.mk index 7bc4fc2d8b..12d14b9152 100644 --- a/rts/include/ghc.mk +++ b/rts/include/ghc.mk @@ -19,9 +19,8 @@ includes_2_H_CONFIG = $(includes_1_H_CONFIG) includes_1_H_PLATFORM = rts/dist-install/build/include/ghcplatform.h includes_2_H_PLATFORM = $(includes_1_H_PLATFORM) -BUILD_0_INCLUDE_DIR = rts/dist/build/include -BUILD_1_INCLUDE_DIR = rts/dist-install/build/include -BUILD_2_INCLUDE_DIR = $(BUILD_1_INCLUDE_DIR) +BUILD_1_INCLUDE_DIRS = rts/include rts/dist-install/build/include +BUILD_2_INCLUDE_DIRS = $(BUILD_1_INCLUDE_DIRS) # # All header files are in rts/include/{one of these subdirectories} @@ -64,8 +63,7 @@ ifeq "$(GhcUnregisterised)" "YES" includes_CC_OPTS += -DUSE_MINIINTERPRETER endif -includes_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) -includes_CC_OPTS += -I$(BUILD_1_INCLUDE_DIR) +includes_CC_OPTS += $(addprefix -I,$(BUILD_1_INCLUDE_DIRS)) includes_CC_OPTS += -Irts ifneq "$(GhcWithSMP)" "YES" |