Commit 835cd339 authored by Ian Lynagh's avatar Ian Lynagh

Hack to find gcc for an in-place ghc

parent 82de8caa
......@@ -68,6 +68,10 @@ endif
endif
GHC_PKG := $(OLD_BUILD_SYSTEM_GHC_PKG)
HP2PS_ABS := $(OLD_BUILD_SYSTEM_HP2PS)
# XXX This GCC definition is a hack. Once the in-tree GHC has a gcc in the
# right place we won't need to do this, as Cabal will be able to find
# gcc relative to ghc's location.
GCC := $(shell cd $(TOP)/.. && $(MAKE) --no-print-directory show VALUE=WhatGccIsCalled | sed 's/.*"\(.*\)"/\1/')
else
NEW_BUILD_SYSTEM_STAGE1_GHC := $(abspath $(TOP)/../inplace/bin/ghc-stage1)
......
......@@ -15,6 +15,10 @@ TIMEOUT_PROGRAM = install-inplace/bin/timeout$(exeext)
PREFIX := $(abspath install-inplace)
$(eval $(call canonicalise,PREFIX))
ifneq "$(GCC)" ""
WITH_GCC = --with-gcc=$(GCC)
endif
ifeq "$(filter thr, $(GhcRTSWays))" ""
$(TIMEOUT_PROGRAM): timeout.py
rm -rf install-inplace
......@@ -26,7 +30,9 @@ else
$(TIMEOUT_PROGRAM): timeout.hs
rm -rf install-inplace
$(TEST_HC) --make Setup
./Setup configure --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) \
./Setup configure --with-compiler=$(TEST_HC) \
--with-hc-pkg=$(GHC_PKG) \
$(WITH_GCC) \
--ghc-option=-threaded --prefix=$(PREFIX)
./Setup build
./Setup install
......
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