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
6b715274
Commit
6b715274
authored
Jan 19, 2011
by
Ian Lynagh
Browse files
Move some make variables around
parent
e6635fe6
Changes
2
Hide whitespace changes
Inline
Side-by-side
rules/build-package.mk
View file @
6b715274
...
...
@@ -64,6 +64,18 @@ define build-package-helper
$(call
package-config,$1,$2,$3)
# Bootstrapping libs are only built one way
ifeq
"$3" "0"
$1_$2_WAYS
=
v
else
$1_$2_WAYS
=
$
$(GhcLibWays)
endif
# We must use a different dependency file if $(GhcLibWays) changes, so
# encode the ways into the name of the file.
$1_$2_WAYS_DASHED
=
$
$(
subst
$
$(space)
,,
$
$(
patsubst
%,-%,
$
$(
strip
$$
(
$1_$2_WAYS
))))
$1_$2_depfile_base
=
$1
/
$2
/build/.depend
$$
(
$1_$2_WAYS_DASHED
)
########################################
ifeq
"$$($1_$2_CONFIGURE_PHASE)" ""
$$(error
No
configure
phase
for
$1_$2)
...
...
@@ -125,24 +137,12 @@ endif
ifeq
"$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES"
# Bootstrapping libs are only built one way
ifeq
"$3" "0"
$1_$2_WAYS
=
v
else
$1_$2_WAYS
=
$
$(GhcLibWays)
endif
$(call
hs-sources,$1,$2)
$(call
c-sources,$1,$2)
$(call
includes-sources,$1,$2)
# --- DEPENDENCIES
# We must use a different dependency file if $(GhcLibWays) changes, so
# encode the ways into the name of the file.
$1_$2_WAYS_DASHED
=
$
$(
subst
$
$(space)
,,
$
$(
patsubst
%,-%,
$
$(
strip
$$
(
$1_$2_WAYS
))))
$1_$2_depfile_base
=
$1
/
$2
/build/.depend
$$
(
$1_$2_WAYS_DASHED
)
$(call
build-dependencies,$1,$2,$3)
# --- BUILDING
...
...
rules/build-prog.mk
View file @
6b715274
...
...
@@ -54,6 +54,8 @@ endif
$(call
package-config,$1,$2,$3)
$1_$2_depfile_base
=
$1
/
$2
/build/.depend
ifeq
"$$($1_$2_INSTALL_INPLACE)" "NO"
ifeq
"$(findstring clean,$(MAKECMDGOALS))" ""
$1_$2_INPLACE
=
$
$(
error
$1_$2
should not be installed inplace, but INPLACE var evaluated
)
...
...
@@ -156,8 +158,6 @@ $(call c-sources,$1,$2)
# --- DEPENDENCIES
$1_$2_depfile_base
=
$1
/
$2
/build/.depend
$(call
build-dependencies,$1,$2,$3)
# --- IMPLICIT RULES
...
...
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