projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide more make rules when cleaning
[ghc-hetmet.git]
/
rts
/
ghc.mk
diff --git
a/rts/ghc.mk
b/rts/ghc.mk
index
4f81e10
..
c22c862
100644
(file)
--- a/
rts/ghc.mk
+++ b/
rts/ghc.mk
@@
-70,6
+70,11
@@
rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c
rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.h) $(wildcard rts/*.h)
rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.h) $(wildcard rts/*.h)
+# collect the -l flags that we need to link the rts dyn lib.
+rts/libs.depend : $(GHC_PKG_INPLACE)
+ $$(GHC_PKG_INPLACE) field rts extra-libraries \
+ | sed -e 's/^extra-libraries: //' -e 's/\([a-z]*\)/-l\1/g' > $$@
+
#-----------------------------------------------------------------------------
# Building one way
#-----------------------------------------------------------------------------
# Building one way
@@
-80,6
+85,8
@@
define cmm-suffix-rules
# .cmm files depend on all the .h files, to a first approximation.
# .cmm files depend on all the .h files, to a first approximation.
+ifneq "$$(CLEANING)" "YES"
+
ifneq "$$(BootingFromHc)" "YES"
$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
ifneq "$$(BootingFromHc)" "YES"
$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
@@
-108,6
+115,8
@@
$1/$2/build/%.$$($3_way_)o : $1/%.hc
$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.hc
$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.hc
$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+endif
+
endef
endef
@@
-139,9
+148,9
@@
rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_
rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
ifneq "$$(findstring dyn, $1)" ""
rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
ifneq "$$(findstring dyn, $1)" ""
-$$(rts_$1_LIB) : $$(rts_$1_OBJS)
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
$$(RM) $$@
$$(RM) $$@
- $$(rts_dist_HC) -shared -dynamic -no-auto-link-packages $$(rts_$1_OBJS) -o $$@
+ $$(rts_dist_HC) -shared -dynamic -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
else
$$(rts_$1_LIB) : $$(rts_$1_OBJS)
$$(RM) $$@
else
$$(rts_$1_LIB) : $$(rts_$1_OBJS)
$$(RM) $$@