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
2f7dc066
Commit
2f7dc066
authored
May 04, 2010
by
Ian Lynagh
Browse files
In build system, call package-config after including package data
Otherwise the $1_$2_HC_OPTS variable gets clobbered.
parent
4aa564ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
rules/build-package.mk
View file @
2f7dc066
...
...
@@ -80,12 +80,12 @@ endif
# --- CONFIGURATION
$(call
package-config,$1,$2,$3)
ifneq
"$$(NO_INCLUDE_PKGDATA)" "YES"
include
$1/$2/package-data.mk
endif
$(call
package-config,$1,$2,$3)
ifeq
"$$($1_$2_DISABLE)" "YES"
ifeq
"$$(DEBUG)" "YES"
...
...
rules/build-prog.mk
View file @
2f7dc066
...
...
@@ -49,14 +49,14 @@ define build-prog-helper
$(call
all-target,$1,all_$1_$2)
$(call
package-config,$1,$2,$3)
ifeq
"$$($1_USES_CABAL)" "YES"
ifneq
"$$(NO_INCLUDE_PKGDATA)" "YES"
include
$1/$2/package-data.mk
endif
endif
$(call
package-config,$1,$2,$3)
ifeq
"$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES"
$1_$2_DISABLE
=
YES
endif
...
...
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