summaryrefslogtreecommitdiff
path: root/utils/genapply
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-11-13 15:38:21 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-11-16 03:13:10 -0500
commit3e94b5a7ebddf156f00599c6bd2e9ba1af437a6c (patch)
tree7c4baf6a8c660cce215a79634a545991f073b4c3 /utils/genapply
parent85f2c0ba760377e68673d9efb336ac762e04683c (diff)
downloadhaskell-3e94b5a7ebddf156f00599c6bd2e9ba1af437a6c.tar.gz
Make: Get rid of `BUILD_.*_INCLUDE_DIRS`
First, we improve some of the rules around -I include dirs, and CPP opts. Then, we just specify the RTS's include dirs normally (locally per the package and in the package conf), and then everything should work normally. The primops.txt.pp rule needs no extra include dirs at all, as it no longer bakes in a target platfom. Reverts some of the extra stage arguments I added in 05419e55cab272ed39790695f448b311f22669f7, as they are no longer needed.
Diffstat (limited to 'utils/genapply')
-rw-r--r--utils/genapply/ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk
index 363f8bb5d1..5721c9069a 100644
--- a/utils/genapply/ghc.mk
+++ b/utils/genapply/ghc.mk
@@ -27,4 +27,4 @@ $(eval $(call build-prog,utils/genapply,dist,0))
# Purposely do the wrong stage for HOST := TARGET hack.
# See Note [Genapply target as host for RTS macros].
-utils/genapply_dist_CC_OPTS += $(addprefix -I,$(BUILD_1_INCLUDE_DIRS))
+utils/genapply_dist_CC_OPTS += $(addprefix -Irts/include,$(includes_dist-install_DIST_INCLUDE_DIRS))