diff options
| author | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2020-12-20 12:57:49 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-04-07 18:37:46 -0400 |
| commit | c5ea48d123c9f47e12b4314b9d81ad70078e1672 (patch) | |
| tree | 8b9671fc2c13fd5cd4bbd948c7c6d3dc3af08318 | |
| parent | 917a4595cb1e93c32baf5d4f5f893858fcf5c7ce (diff) | |
| download | haskell-c5ea48d123c9f47e12b4314b9d81ad70078e1672.tar.gz | |
make: disable ghc package environments #18988
(cherry picked from commit f27a71449aeb86ad9afa02431b3bd1a62ff5400a)
| -rw-r--r-- | rules/distdir-way-opts.mk | 1 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index d604fcf621..a0dba3a1fe 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -120,6 +120,7 @@ $1_$2_$3_MOST_HC_OPTS = \ $$(if $$($1_$2_PROG),, \ $$(if $$($1_PACKAGE),$$($4_THIS_UNIT_ID) $$($1_$2_COMPONENT_ID))) \ $$(if $$($1_PACKAGE),-hide-all-packages) \ + -package-env - \ -i $$(if $$($1_$2_HS_SRC_DIRS),$$(foreach dir,$$($1_$2_HS_SRC_DIRS),-i$1/$$(dir)),-i$1) \ -i$1/$2/build \ -I$1/$2/build \ diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index fba1d638a5..5566f56d42 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -61,6 +61,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE0)) \ -O0 \ -hide-all-packages \ + -package-env - \ $(addprefix -package , $(CABAL_BUILD_DEPS)) \ --make utils/ghc-cabal/Main.hs -o $@ \ -no-user-package-db \ |