[project @ 2005-03-08 04:45:29 by wolfgang]

[ghc-hetmet.git] / ghc / rts / Makefile

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 73ba68f..934c429 100644 (file)
--- 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; \
@@ -331,14 +338,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
 
 #-----------------------------------------------------------------------------