Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
157ac08b
Commit
157ac08b
authored
Apr 21, 2013
by
ian@well-typed.com
Browse files
Fix "make 2" in ghc/
The ghc-stage1_INPLACE variable wasn't being defined
parent
d65a61df
Changes
1
Hide whitespace changes
Inline
Side-by-side
rules/build-prog.mk
View file @
157ac08b
...
...
@@ -42,6 +42,8 @@ endif
$(call
clean-target,$1,$2,$1/$2)
$$(eval
$$(call
build-prog-vars,$1,$2,$3))
ifneq
"$$($1_$2_NOT_NEEDED)" "YES"
$$(eval
$$(call
build-prog-helper,$1,$2,$3))
endif
...
...
@@ -49,7 +51,7 @@ $(call profEnd, build-prog($1,$2,$3))
endef
define
build-prog-
helper
define
build-prog-
vars
# $1 = dir
# $2 = distdir
# $3 = GHC stage to use (0 == bootstrapping compiler)
...
...
@@ -80,8 +82,6 @@ else
$1_$2_WANT_INSTALLED_WRAPPER
=
NO
endif
$(call
package-config,$1,$2,$3)
$1_$2_depfile_base
=
$1
/
$2
/build/.depend
ifeq
"$$($1_$2_INSTALL_INPLACE)" "NO"
...
...
@@ -109,6 +109,15 @@ $1_$2_INPLACE = $$($$($1_$2_PROGNAME)_INPLACE)
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"
$(call
build-package-data,$1,$2,$3)
ifneq
"$$(NO_INCLUDE_PKGDATA)" "YES"
...
...
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