Commit 371a1bbb authored by Simon Marlow's avatar Simon Marlow
Browse files

Track the GHC source tree reorganisation

parent 051af0cb
......@@ -26,9 +26,9 @@ endif
export MAKE
# ghastly hack, because the driver requires that $tool be an absolute path name.
GHC_STAGE1_ABS = $(FPTOOLS_TOP_ABS)/ghc/compiler/stage1/ghc-inplace
GHC_STAGE2_ABS = $(FPTOOLS_TOP_ABS)/ghc/compiler/stage2/ghc-inplace
GHC_STAGE3_ABS = $(FPTOOLS_TOP_ABS)/ghc/compiler/stage3/ghc-inplace
GHC_STAGE1_ABS = $(GHC_COMPILER_DIR_ABS)/stage1/ghc-inplace
GHC_STAGE2_ABS = $(GHC_COMPILER_DIR_ABS)/stage2/ghc-inplace
GHC_STAGE3_ABS = $(GHC_COMPILER_DIR_ABS)/stage3/ghc-inplace
EXTRA_HC_OPTS += -D$(HostPlatform_CPP)
# ideally TargetPlatform_CPP, but that doesn't exist; they're always the same anyway
......
......@@ -3,7 +3,6 @@ include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/test.mk
PKGCONF=local.package.conf
GHC_PKG_INPLACE = $(FPTOOLS_TOP)/ghc/utils/ghc-pkg/ghc-pkg-inplace
GHC_PKG= $(GHC_PKG_INPLACE) -f $(PKGCONF)
# a bunch of tests for ghc-pkg
......@@ -79,7 +78,7 @@ COPY_PACKAGE_CONF = package.conf.copy
GHC_PKG_COPY = $(GHC_PKG_INPLACE) --global-conf=$(COPY_PACKAGE_CONF)
copy :
cp $(FPTOOLS_TOP)/ghc/driver/package.conf.inplace $(COPY_PACKAGE_CONF)
cp $(GHC_DRIVER_DIR)/package.conf.inplace $(COPY_PACKAGE_CONF)
ghcpkg02 : copy
for i in `$(GHC_PKG_COPY) list --global --simple-output`; do \
......
......@@ -2,8 +2,6 @@ TOP=../../../..
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/test.mk
GHC_PKG=$(FPTOOLS_TOP)/ghc/utils/ghc-pkg/ghc-pkg-inplace
clean:
rm -rf setup a.out dist/build/testA
rm -rf ,tmp dist ,tmp2
......@@ -17,11 +15,11 @@ setup : Setup.lhs
cabal01: setup
# unregister if pakage 'test' already exists
if $(GHC_PKG) --user list | grep test-; then \
$(GHC_PKG) --user unregister test; \
if $(GHC_PKG_INPLACE) --user list | grep test-; then \
$(GHC_PKG_INPLACE) --user unregister test; \
fi
./setup configure --prefix=`pwd`/install --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) --enable-library-profiling
./setup configure --prefix=`pwd`/install --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG_INPLACE) --enable-library-profiling
./setup build
./setup copy --copy-prefix=`pwd`/install-tmp
ls install-tmp
......@@ -30,4 +28,4 @@ cabal01: setup
ls install
./setup sdist
ls dist
$(GHC_PKG) unregister --user test
$(GHC_PKG_INPLACE) unregister --user test
Markdown is supported
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