Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jberryman
GHC
Commits
814946f3
Commit
814946f3
authored
Sep 02, 2010
by
Ian Lynagh
Browse files
Add some -no-user-package-conf flags
Stops user-installed packages breaking the build
parent
f571f630
Changes
4
Hide whitespace changes
Inline
Side-by-side
aclocal.m4
View file @
814946f3
...
...
@@ -1266,7 +1266,7 @@ if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then
rm -f *.hi
rm -f ghc-pwd
rm -f ghc-pwd.exe
"$WithGhc" -v0 --make ghc-pwd -o ghc-pwd
"$WithGhc" -v0
-no-user-package-conf
--make ghc-pwd -o ghc-pwd
cd ../..
fi
...
...
rules/package-config.mk
View file @
814946f3
...
...
@@ -32,6 +32,7 @@ $1_$2_HC_DEP =
$1_$2_HC_PKGCONF
=
-package-conf
$
$(BOOTSTRAPPING_CONF)
$1_$2_GHC_PKG_OPTS
=
--package-conf
=
$
$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS
+=
--package-db
=
$
$(TOP)
/
$
$(BOOTSTRAPPING_CONF)
$1_$2_HC_OPTS
+=
-no-user-package-conf
ifeq
"$(ghc_ge_613)" "YES"
$1_$2_HC_OPTS
+=
-rtsopts
endif
...
...
utils/ghc-cabal/ghc.mk
View file @
814946f3
...
...
@@ -27,6 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/D
$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext)
:
$(GHC_CABAL_DIR)/ghc-cabal.hs | $$(dir $$@)/. bootstrapping/.
"
$(GHC)
"
$(SRC_HC_OPTS)
--make
$(GHC_CABAL_DIR)
/ghc-cabal.hs
-o
$@
\
-no-user-package-conf
\
-Wall
$(WERROR)
\
-DCABAL_VERSION
=
$(CABAL_VERSION)
\
-odir
bootstrapping
\
...
...
utils/ghc-pkg/ghc.mk
View file @
814946f3
...
...
@@ -48,6 +48,7 @@ endif
# The binary package is not warning-clean, so we need a few -fno-warns here.
utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext)
:
utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs $(GHC_CABAL_INPLACE) | bootstrapping/. $$(dir $$@)/.
"
$(GHC)
"
$(SRC_HC_OPTS)
--make
utils/ghc-pkg/Main.hs
-o
$@
\
-no-user-package-conf
\
-Wall
-fno-warn-unused-imports
\
-DCABAL_VERSION
=
$(CABAL_VERSION)
\
-DBOOTSTRAPPING
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment