diff options
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 468fcafc45..b788bc15b4 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -152,7 +152,7 @@ $(call c-sources,$1,$2) # --- IMPLICIT RULES -$(call distdir-opts,$1,$2,,$3) +$(call distdir-opts,$1,$2,$3) $(call distdir-way-opts,$1,$2,$$($1_$2_PROGRAM_WAY),$3) ifeq "$3" "0" @@ -209,7 +209,9 @@ ifeq "$$(TargetOS_CPP)" "darwin" ifneq "$3" "0" ifeq "$$($1_$2_PROGRAM_WAY)" "dyn" # Use relative paths for all the libraries +ifneq "$$($1_$2_TRANSITIVE_DEP_NAMES)" "" install_name_tool $$(foreach d,$$($1_$2_TRANSITIVE_DEP_NAMES), -change $$(TOP)/$$($$($$d_INSTALL_INFO)_dyn_LIB) @loader_path/../$$d-$$($$($$d_INSTALL_INFO)_VERSION)/$$($$($$d_INSTALL_INFO)_dyn_LIB_NAME)) $$@ +endif # Use relative paths for the RTS. Rather than try to work out which RTS # way is being linked, we just change it for all ways install_name_tool $$(foreach w,$$(rts_WAYS), -change $$(TOP)/$$(rts_$$w_LIB) @loader_path/../rts-$$(rts_VERSION)/$$(rts_$$w_LIB_NAME)) $$@ @@ -232,11 +234,11 @@ ifneq "$$($1_$2_HS_SRCS)" "" ifeq "$$(strip $$(ALL_STAGE1_LIBS))" "" $$(error ordering failure in $1 ($2): ALL_STAGE1_LIBS is empty) endif -endif $1/$2/build/tmp/$$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS) endif endif endif +endif ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" $(call all-target,$1_$2,$$($1_$2_INPLACE)) |