X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=934c4291d6c493b494963c8643912f0acd03c3cf;hb=f97dcf9fc2ea2a419087bca53f2fea811c5181a9;hp=596ca79aa55dbf0364d269d862a4b660fa09bf24;hpb=593d142d840df09f64b2e8a24f19a298122e27a3;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 596ca79..934c429 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
@@ -146,6 +153,9 @@ SUBDIRS += dotnet
 LIBOBJS += dotnet/Invoke.o
 endif
 
+# Suppress uninitialized variable warnings for GC.c
+GC_CC_OPTS 	+= -Wno-uninitialized
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -223,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; \
@@ -320,6 +330,7 @@ SRC_HC_OPTS += -fvia-C
 # We *want* type-checking of hand-written cmm.
 SRC_HC_OPTS += -dcmm-lint 
 
+ifneq "$(BootingFromHc)" "YES"
 # .cmm files depend on all the .h files, to a first approximation.
 %.$(way_)o : %.cmm $(H_FILES)
 	$(HC_PRE_OPTS)
@@ -327,14 +338,11 @@ SRC_HC_OPTS += -dcmm-lint
 	$(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
 
 #-----------------------------------------------------------------------------
 #