projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acf18dd
)
Put the CMM objects in the GHCi library too
author
Ian Lynagh
<igloo@earth.li>
Thu, 11 Jun 2009 16:20:38 +0000
(16:20 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 11 Jun 2009 16:20:38 +0000
(16:20 +0000)
rules/build-package-way.mk
patch
|
blob
|
history
diff --git
a/rules/build-package-way.mk
b/rules/build-package-way.mk
index
8a5b07b
..
78f0e34
100644
(file)
--- a/
rules/build-package-way.mk
+++ b/
rules/build-package-way.mk
@@
-76,9
+76,9
@@
$1_$2_GHCI_LIB = $1/$2/build/HS$$($1_PACKAGE)-$$($1_$2_VERSION).$$($3_osuf)
ifneq "$4" "0"
BINDIST_LIBS += $$($1_$2_GHCI_LIB)
endif
ifneq "$4" "0"
BINDIST_LIBS += $$($1_$2_GHCI_LIB)
endif
-$$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS)
+$$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS)
"$$(RM)" $$(RM_OPTS) $$@
"$$(RM)" $$(RM_OPTS) $$@
- "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)`
+ "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)`
$(call all-target,$1_$2,$$($1_$2_GHCI_LIB))
endif
$(call all-target,$1_$2,$$($1_$2_GHCI_LIB))
endif