diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-06-08 14:24:19 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-06-08 14:24:19 +0100 |
| commit | 1197ed04ce0167d52ffa248402ef3eb0bfd046b9 (patch) | |
| tree | 5847ce3e2b8948f5fc31f691d01e6225b75c786f /rules/build-package-way.mk | |
| parent | 0cdd53372d64691dffadee5901ab5eeae6338976 (diff) | |
| parent | 7befd215db8272ec6301abf1a05e6347da5d3ec8 (diff) | |
| download | haskell-1197ed04ce0167d52ffa248402ef3eb0bfd046b9.tar.gz | |
Merge remote-tracking branch 'origin/pretty-build'
Diffstat (limited to 'rules/build-package-way.mk')
| -rw-r--r-- | rules/build-package-way.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 4b603c2a2d..9919d3b954 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -64,14 +64,14 @@ ifeq "$3" "dyn" # On windows we have to supply the extra libs this one links to when building it. ifeq "$$(HostOS_CPP)" "mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ + $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) \ -no-auto-link-packages \ -o $$@ else $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ + $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ -dylib-install-name $(ghclibdir)/`basename "$$@" | sed 's/^libHS//;s/[-]ghc.*//'`/`basename "$$@"` \ -no-auto-link-packages \ @@ -88,7 +88,7 @@ else echo $$($1_$2_$3_ALL_OBJS) >> $$@.contents endif ifeq "$$($1_$2_ArSupportsAtFile)" "YES" - "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ @$$@.contents + $$(call cmd,$1_$2_AR) $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ @$$@.contents else "$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ < $$@.contents endif @@ -114,7 +114,7 @@ BINDIST_LIBS += $$($1_$2_GHCI_LIB) endif endif $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) - "$$(LD)" $$(CONF_LD_LINKER_OPTS_STAGE$4) -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) + $$(call cmd,LD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" # Don't bother making ghci libs for bootstrapping packages |