[commit: ghc] master: Merge remote-tracking branch 'origin/pretty-build' (1197ed0)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1197ed04ce0167d52ffa248402ef3eb0bfd046b9

>---------------------------------------------------------------

commit 1197ed04ce0167d52ffa248402ef3eb0bfd046b9
Merge: 0cdd533... 7befd21...
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date:   Fri Jun 8 14:24:19 2012 +0100

    Merge remote-tracking branch 'origin/pretty-build'

 ghc.mk                          |    1 +
 rules/build-package-data.mk     |    2 +-
 rules/build-package-way.mk      |    8 ++++----
 rules/build-prog.mk             |    4 ++--
 rules/c-suffix-rules.mk         |   22 +++++++++++-----------
 rules/cmm-suffix-rules.mk       |   12 ++++++------
 rules/hs-suffix-rules-srcdir.mk |   30 +++++++++++++++---------------
 rules/hs-suffix-rules.mk        |    8 ++++----
 rules/package-config.mk         |    7 +++++++
 rules/pretty_commands.mk        |   13 +++++++++++++
 10 files changed, 64 insertions(+), 43 deletions(-)

diff --cc rules/build-package-way.mk
index 4b603c2,40b7232..9919d3b
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@@ -62,9 -62,9 +62,9 @@@ ifeq "$3" "dyn
  
  # Link a dynamic library
  # On windows we have to supply the extra libs this one links to when building it.
 -ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
 +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 \