diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-04 16:00:17 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-04 16:00:17 +0100 |
| commit | 16a8414061a1fef7d90e162e5253d3005cb11806 (patch) | |
| tree | 31f6012c521e47b1c5b6f32ac04ba54a2adc5099 /rules/build-dependencies.mk | |
| parent | 911bc5ce96f54a3be63e6e7dcfa9bc6ccb8495e0 (diff) | |
| download | haskell-16a8414061a1fef7d90e162e5253d3005cb11806.tar.gz | |
Actually build things the dynamic way
Things went back to being statically linked again once I added an
explicit -static flag to the vanilla way.
Diffstat (limited to 'rules/build-dependencies.mk')
| -rw-r--r-- | rules/build-dependencies.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk index a37ff16bab..edde237784 100644 --- a/rules/build-dependencies.mk +++ b/rules/build-dependencies.mk @@ -35,7 +35,7 @@ $$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC $$(call removeFiles,$$@.tmp) ifneq "$$($1_$2_HS_SRCS)" "" "$$($1_$2_HC_MK_DEPEND)" -M $$($1_$2_MKDEPENDHS_FLAGS) \ - $$(filter-out -split-objs, $$($1_$2_v_ALL_HC_OPTS)) \ + $$(filter-out -split-objs, $$($1_$2_$$(firstword $$($1_$2_WAYS))_ALL_HC_OPTS)) \ $$($1_$2_HS_SRCS) endif echo "$1_$2_depfile_haskell_EXISTS = YES" >> $$@.tmp @@ -125,7 +125,7 @@ endef # to "i" on Windows and "" on any other platform. define addCFileDeps - $(CPP) $($1_$2_MKDEPENDC_OPTS) $($1_$2_v_ALL_CC_OPTS) $($(basename $4)_CC_OPTS) -MM $4 -MF $3.bit + $(CPP) $($1_$2_MKDEPENDC_OPTS) $($1_$2_$(firstword $($1_$2_WAYS))_ALL_CC_OPTS) $($(basename $4)_CC_OPTS) -MM $4 -MF $3.bit $(foreach w,$5,sed -e 's|\\|/|g' -e 's| /$$| \\|' -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|$(TOP)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true endef |