projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor package installation
[ghc-hetmet.git]
/
rules
/
build-package.mk
diff --git
a/rules/build-package.mk
b/rules/build-package.mk
index
1c15c6f
..
9e1ab7a
100644
(file)
--- a/
rules/build-package.mk
+++ b/
rules/build-package.mk
@@
-49,6
+49,14
@@
ifneq "$$($1_$2_GROUP)" ""
all_$$($1_$2_GROUP): all_$1_$2
endif
all_$$($1_$2_GROUP): all_$1_$2
endif
+ifneq "$$(CHECKED_$1)" "YES"
+CHECKED_$1 = YES
+check_packages: check_$1
+.PHONY: check_$1
+check_$1: $$(GHC_CABAL_INPLACE)
+ $$(GHC_CABAL_INPLACE) check $1
+endif
+
distclean : clean_$1_$2_config
maintainer-clean : distclean
distclean : clean_$1_$2_config
maintainer-clean : distclean
@@
-60,7
+68,6
@@
clean_$1_$2_config:
# --- CONFIGURATION
# --- CONFIGURATION
-$1_$2_USE_BOOT_LIBS = YES
$(call package-config,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
$(call package-config,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
@@
-81,7
+88,7
@@
$(call all-target,$1_$2,$1/$2/package-data.mk)
ifneq "$$(BINDIST)" "YES"
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
ifneq "$$(BINDIST)" "YES"
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
-$(call build-package-data,$1,$2)
+$(call build-package-data,$1,$2,$3)
endif
else
endif
else
@@
-127,8
+134,6
@@
$1_$2_SplitObjs = NO
endif
endif
endif
endif
-$(call distdir-opts,$1,$2,$3)
-
# C and S files are possibly built the "dyn" way.
ifeq "$(BuildSharedLibs)" "YES"
$(call c-objs,$1,$2,dyn)
# C and S files are possibly built the "dyn" way.
ifeq "$(BuildSharedLibs)" "YES"
$(call c-objs,$1,$2,dyn)