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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/genapply/ghc.mk | 2 | ||||
| -rw-r--r-- | utils/hp2ps/ghc.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk index 8da1f7aaf6..363f8bb5d1 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 += -I,$(BUILD_1_INCLUDE_DIR) +utils/genapply_dist_CC_OPTS += $(addprefix -I,$(BUILD_1_INCLUDE_DIRS)) diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk index 75baa9ac4d..a309e116a1 100644 --- a/utils/hp2ps/ghc.mk +++ b/utils/hp2ps/ghc.mk @@ -10,9 +10,8 @@ # # ----------------------------------------------------------------------------- -utils/hp2ps_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) - # stage0 +utils/hp2ps_dist_CC_OPTS += $(addprefix -I,$(BUILD_0_INCLUDE_DIRS)) utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ Reorder.c TopTwenty.c AuxFile.c Deviation.c \ HpFile.c Marks.c Scale.c TraceElement.c \ @@ -25,6 +24,7 @@ utils/hp2ps_dist_SHELL_WRAPPER = YES utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME = hp2ps # stage 1 +utils/hp2ps_dist-install_CC_OPTS += $(addprefix -I,$(BUILD_1_INCLUDE_DIRS)) utils/hp2ps_dist-install_C_SRCS = $(utils/hp2ps_dist_C_SRCS) utils/hp2ps_dist-install_EXTRA_LIBRARIES = $(utils/hp2ps_dist_EXTRA_LIBRARIES) utils/hp2ps_dist-install_PROGNAME = $(utils/hp2ps_dist_PROGNAME) |