summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-05-16 18:30:20 +0000
committerIan Lynagh <igloo@earth.li>2009-05-16 18:30:20 +0000
commit81e5f8ff44ed5c734c9966ba0f3faf2d84c74577 (patch)
tree65f65c04ff17084e128cede35d377795be2f9d94 /rts
parentfc15f6e876f3b8202a1053f809253b39dc8a8923 (diff)
downloadhaskell-81e5f8ff44ed5c734c9966ba0f3faf2d84c74577.tar.gz
Bootstrapping fixes
Diffstat (limited to 'rts')
-rw-r--r--rts/ghc.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk
index c22c8620e1..c4a3dd5042 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -43,6 +43,8 @@ EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
rts_CMM_SRCS = $(wildcard rts/*.cmm)
+# Don't compile .S files when bootstrapping a new arch
+ifeq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
rts_S_SRCS += rts/AdjustorAsm.S
else
@@ -50,6 +52,7 @@ ifneq "$(findstring $(TargetOS_CPP), darwin)" ""
rts_S_SRCS += rts/AdjustorAsm.S
endif
endif
+endif
ifeq "$(GhcUnregisterised)" "YES"
GENAPPLY_OPTS = -u