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/ghc.mk | |
| 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/ghc.mk')
| -rw-r--r-- | rts/ghc.mk | 6 |
1 files changed, 2 insertions, 4 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 |