X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=29b2f9a0b7c8c20cf664dd2b48d39e9bc9dbb95a;hb=daa4d18454157f664a0ff333bb592bb0bd6b4edc;hp=73ba68ffa82b6945dedd4e3021b79cc704156e0d;hpb=d9c3fa92eb2151d05e3766705d6ceaea12a897b2;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 73ba68f..29b2f9a 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -57,6 +57,13 @@ else
 EXCLUDED_SRCS += Main.c
 endif
 
+# This file ends up being empty unless we're building for a powerpc
+# system, and it is reported that Solaris ld chokes on it when building
+# HSrts.o.
+ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
+EXCLUDED_SRCS += AdjustorAsm.S
+endif
+
 EXCLUDED_SRCS += parallel/SysMan.c
 
 # The build system doesn't give us these
@@ -226,7 +233,7 @@ endif
 # and not worth re-implementing in our Makefile framework.
 
 ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkHaskellSupport)" "YES"
+ifneq "$(HaveFrameworkGMP)" "YES"
 boot ::
 	if [ -f gmp/config.status ]; then \
 	   cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
@@ -311,6 +318,8 @@ SRC_HC_OPTS += \
   -\#include ProfHeap.h \
   -\#include LdvProfile.h \
   -\#include Profiling.h \
+  -\#include StoragePriv.h \
+  -\#include OSThreads.h \
   -\#include Apply.h
 
 ifeq "$(Windows)" "YES"
@@ -331,14 +340,10 @@ ifneq "$(BootingFromHc)" "YES"
 	$(HC_POST_OPTS)
 
 %.$(way_)hc : %.cmm $(H_FILES)
-	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -C $< -o $@
-	$(HC_POST_OPTS)
 
 %.$(way_)s : %.cmm $(H_FILES)
-	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -S $< -o $@
-	$(HC_POST_OPTS)
 endif
 
 #-----------------------------------------------------------------------------