Commit 592766aa authored by Simon Marlow's avatar Simon Marlow
Browse files

put the inplace GHC in stageN-inplace/ghc instead of stageN-inplace/bin/ghc

just saves a bit of typing
parent 228c19b0
...@@ -85,7 +85,7 @@ build.stage.%: ...@@ -85,7 +85,7 @@ build.stage.%:
$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \ $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
$(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
$(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
'$$prefix/bin' \ '$$prefix' \
'$(INPLACE_DATA_DIR)' \ '$(INPLACE_DATA_DIR)' \
'$$prefix/libexec' \ '$$prefix/libexec' \
'$$prefix/dynlib' \ '$$prefix/dynlib' \
......
...@@ -868,9 +868,9 @@ NHC = @NHC@ ...@@ -868,9 +868,9 @@ NHC = @NHC@
# tree). We can refer to "this ghc" as $(GHC_INPLACE): # tree). We can refer to "this ghc" as $(GHC_INPLACE):
GHC_INPLACE = $(GHC_STAGE1) GHC_INPLACE = $(GHC_STAGE1)
GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/bin/ghc GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/ghc
GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/bin/ghc GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/ghc
GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/bin/ghc GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/ghc
# XXX All those used to have -no-user-package-conf, but then we can't # XXX All those used to have -no-user-package-conf, but then we can't
# pass them to Cabal # pass them to Cabal
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment