Commit 157ac08b authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Fix "make 2" in ghc/

The ghc-stage1_INPLACE variable wasn't being defined
parent d65a61df
...@@ -42,6 +42,8 @@ endif ...@@ -42,6 +42,8 @@ endif
$(call clean-target,$1,$2,$1/$2) $(call clean-target,$1,$2,$1/$2)
$$(eval $$(call build-prog-vars,$1,$2,$3))
ifneq "$$($1_$2_NOT_NEEDED)" "YES" ifneq "$$($1_$2_NOT_NEEDED)" "YES"
$$(eval $$(call build-prog-helper,$1,$2,$3)) $$(eval $$(call build-prog-helper,$1,$2,$3))
endif endif
...@@ -49,7 +51,7 @@ $(call profEnd, build-prog($1,$2,$3)) ...@@ -49,7 +51,7 @@ $(call profEnd, build-prog($1,$2,$3))
endef endef
define build-prog-helper define build-prog-vars
# $1 = dir # $1 = dir
# $2 = distdir # $2 = distdir
# $3 = GHC stage to use (0 == bootstrapping compiler) # $3 = GHC stage to use (0 == bootstrapping compiler)
...@@ -80,8 +82,6 @@ else ...@@ -80,8 +82,6 @@ else
$1_$2_WANT_INSTALLED_WRAPPER = NO $1_$2_WANT_INSTALLED_WRAPPER = NO
endif endif
$(call package-config,$1,$2,$3)
$1_$2_depfile_base = $1/$2/build/.depend $1_$2_depfile_base = $1/$2/build/.depend
ifeq "$$($1_$2_INSTALL_INPLACE)" "NO" ifeq "$$($1_$2_INSTALL_INPLACE)" "NO"
...@@ -109,6 +109,15 @@ $1_$2_INPLACE = $$($$($1_$2_PROGNAME)_INPLACE) ...@@ -109,6 +109,15 @@ $1_$2_INPLACE = $$($$($1_$2_PROGNAME)_INPLACE)
endif endif
endif endif
endef
define build-prog-helper
# $1 = dir
# $2 = distdir
# $3 = GHC stage to use (0 == bootstrapping compiler)
$(call package-config,$1,$2,$3)
ifeq "$$($1_$2_USES_CABAL)" "YES" ifeq "$$($1_$2_USES_CABAL)" "YES"
$(call build-package-data,$1,$2,$3) $(call build-package-data,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
......
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