Merge remote-tracking branch 'origin/pretty-build'
authorPaolo Capriotti <p.capriotti@gmail.com>
Fri, 8 Jun 2012 13:24:19 +0000 (14:24 +0100)
committerPaolo Capriotti <p.capriotti@gmail.com>
Fri, 8 Jun 2012 13:24:19 +0000 (14:24 +0100)
1  2 
ghc.mk
rules/build-package-way.mk
rules/package-config.mk

diff --cc ghc.mk
Simple merge
@@@ -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 \
Simple merge