X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=6646da2149a46148718533c04eb8e5f922362f67;hb=1718c708d577ddc87bd1a8774935189d4f0b418b;hp=a17eb2ac4bbc483619001cabd2dec1a2c339476e;hpb=8ba7bea1b3993df0cfe9baa02fa74f3a356afffa;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index a17eb2a..6646da2 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)
@@ -161,6 +160,12 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 SRC_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
+ifeq "$(Windows)" "YES"
+# SDM: when compiled with -fasm the RTS currently has bogus references to 
+# __imp_base_ things, so working around for now:
+SRC_HC_OPTS = -fvia-C
+endif
+
 ifneq "$(DYNAMIC_RTS)" "YES"
 SRC_HC_OPTS += -static
 else
@@ -172,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
 
@@ -202,6 +207,7 @@ RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode
 # ffi.h triggers prototype warnings, so disable them here:
 Interpreter_CC_OPTS += -Wno-strict-prototypes
 Adjustor_CC_OPTS += -Wno-strict-prototypes
+sm/Storage_CC_OPTS += -Wno-strict-prototypes
 
 StgCRun_CC_OPTS += -w
 Typeable_CC_OPTS += -w
@@ -211,9 +217,6 @@ sm/Compact_CC_OPTS += -w
 win32/ConsoleHandler_CC_OPTS += -w
 win32/ThrIOManager_CC_OPTS += -w
 win32/Ticker_CC_OPTS += -w
-Threads_CC_OPTS += -w
-Capability_CC_OPTS += -w
-Schedule_CC_OPTS += -w
 # The above warning supression flags are a temporary kludge.
 # While working on this module you are encouraged to remove it and fix
 # any warnings in the module. See
@@ -291,7 +294,11 @@ ifneq "$(PapiLibDirs)" ""
 SRC_LD_OPTS += -L$(PapiLibDirs)
 endif
 
-endif # GhcRtsWithPapi==YES
+else # GhcRtsWithPapi==YES
+
+PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=""
+
+endif
 
 #-----------------------------------------------------------------------------
 # make depend setup
@@ -397,6 +404,7 @@ sm/Evac_HC_OPTS += -optc-funroll-loops
 
 ifneq "$(findstring thr, $(way))" ""
 EXTRA_SRCS += sm/Evac_thr.c sm/Scav_thr.c
+CLEAN_FILES += sm/Evac_thr.c sm/Scav_thr.c
 
 sm/Evac_thr.c : sm/Evac.c
 	cp $< $@
@@ -451,6 +459,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
 
@@ -458,13 +468,13 @@ endif
 #
 # binary-dist
 
-binary-dist:
-	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/rts
-	$(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/rts/
-	$(INSTALL_DATA)    package.conf.in     $(BIN_DIST_DIR)/rts/
-ifneq "$(INSTALL_LIBS)" ""
-	$(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/rts/
-endif
-ifneq "$(INSTALL_LIBEXECS)" ""
-	$(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/
-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
+