projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify the build system, and remove 2 phases
[ghc-hetmet.git]
/
rules
/
build-package-data.mk
diff --git
a/rules/build-package-data.mk
b/rules/build-package-data.mk
index
be33eab
..
98f66e6
100644
(file)
--- a/
rules/build-package-data.mk
+++ b/
rules/build-package-data.mk
@@
-62,6
+62,7
@@
ifeq "$3" "0"
$1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS)
endif
$1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS)
endif
+ifneq "$$(BINDIST)" "YES"
$1/$2/inplace-pkg-config : $1/$2/package-data.mk
$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk
$1/$2/inplace-pkg-config : $1/$2/package-data.mk
$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk
@@
-75,5
+76,8
@@
ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
"$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
endif
endif
"$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
endif
endif
+endif
+
+PACKAGE_DATA_MKS += $1/$2/package-data.mk
endef
endef