From 25d36c3178945d926f936ee32e57894d1743063c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 11 Nov 2021 05:36:50 +0000 Subject: 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. --- rts/ghc.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'rts/ghc.mk') 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 -- cgit v1.2.1