X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=216d7def88535f082e703d4fdf6412a0ee2a3e28;hb=a74edc69f977205d1aceb3705c4fa34851d4619e;hp=ab5c6e73700d70911f86d1530bfd26897dc79dce;hpb=4afc8afa52f87ae0f94691e026ab8186b9da8b9e;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index ab5c6e7..216d7de 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -27,8 +27,7 @@ HC=$(GHC_INPLACE)
 
 
 # Setting _way here is a nasty hack to make sure we get libHSrts*.a etc
-# rather than just libHSrts.a when we are making and installing
-# bindists.
+# rather than just libHSrts.a when we are installing bindists.
 ifeq "$(DOING_BIN_DIST)" "YES"
 _way = *
 endif
@@ -95,7 +94,7 @@ EXCLUDED_SRCS += parallel/SysMan.c
 
 EXCLUDED_SRCS += dyn-wrapper.c
 
-# compile generatic patchable dyn-wrapper
+# compile generic patchable dyn-wrapper
 
 DYNWRAPPER_SRC = dyn-wrapper.c
 DYNWRAPPER_PROG = dyn-wrapper$(exeext)
@@ -178,7 +177,7 @@ LIB_DEPS=buildbase
 BASE_DIST_LIB=$(TOP)/libraries/base/dist/build
 
 # The following must be a one liner otherwise its evaluation won't be delayed until base/rts packages are properly registered
-LIB_LD_OPTS = -L$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/library-dirs: //') -l$(shell $(GHC_PKG_INPLACE) field base hs-libraries | sed -e 's/hs-libraries: //')-ghc$(ProjectVersion)$(soext) $(foreach lib,$(shell $(GHC_PKG_INPLACE) field rts extra-libraries | sed -e s/extra-libraries://),"-l$(lib)") $(foreach libdir,$(shell $(GHC_PKG_INPLACE) field rts library-dirs | sed -e s/library-dirs://),"-L$(libdir)")
+LIB_LD_OPTS = $(foreach lib,$(shell $(GHC_PKG_INPLACE) field base hs-libraries | sed -e 's/hs-libraries: //'),"-l$(lib)-ghc$(ProjectVersion)$(soext)") $(foreach lib,$(shell $(GHC_PKG_INPLACE) field rts extra-libraries | sed -e s/extra-libraries://),"-l$(lib)") $(foreach libdir,$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/library-dirs: //' | sed -e s,\\\\,/,g) $(shell $(GHC_PKG_INPLACE) field rts library-dirs | sed -e s/library-dirs:// | sed -e s/\\\\/\\\\\\\\/g),"-L$(libdir)")
 endif
 endif
 
@@ -199,9 +198,22 @@ Main_HC_OPTS += -optc-O0
 RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
 RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
 RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ)
+#
 RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ)
+#
 RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ)
+#
 RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ)
+#
 RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ)
 RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ)
 
@@ -460,6 +472,8 @@ ifeq "$(DYNAMIC_RTS) $(HOSTPLATFORM)" "YES i386-unknown-mingw32"
 # libHSrts.dll.a, the import library for dynamic linking required for
 # linking the dynamic version of base
 buildbase: $(LIBRARY).a
+	$(MAKE) way="" -C ../libraries/ make.library.ghc-prim
+	$(MAKE) way="" -C ../libraries/ make.library.integer-gmp
 	$(MAKE) way="" -C ../libraries/ make.library.base
 endif
 
@@ -470,5 +484,10 @@ endif
 BINDIST_EXTRAS += package.conf.in
 BINDIST_EXTRAS += $(INSTALL_LIBS)
 BINDIST_EXTRAS += $(INSTALL_LIBEXECS)
+
+# Setting _way here is a nasty hack to make sure we get libHSrts*.a etc
+# rather than just libHSrts.a when we are making bindists.
+binary-dist: _way=*
+
 include $(TOP)/mk/bindist.mk