X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=a7a2c1145fc3069f6bfed42175ef3920acf7ef61;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=aee33695a533c94bf4ebaad18006bcf2db780a7a;hpb=6f859910070556a0cf07fef17632ec6f18a39984;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index aee3369..a7a2c11 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -103,7 +103,7 @@ rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def
 		| sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \
 		| sed "s/@ProjectVersion@/$(ProjectVersion)/" \
 		> rts/dist/build/win32/libHS$1.def
-		
+
 rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def
 	"$$(DLLTOOL)" 	-d rts/dist/build/win32/libHS$1.def \
 			-l rts/dist/build/win32/libHS$1.dll.a
@@ -116,7 +116,7 @@ rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def
 	cat rts/win32/libHSffi.def \
 		| sed "s/@ProjectVersion@/$(ProjectVersion)/" \
 		> rts/dist/build/win32/libHSffi.def
-		
+
 rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def
 	"$(DLLTOOL)" 	-d rts/dist/build/win32/libHSffi.def \
 			-l rts/dist/build/win32/libHSffi.dll.a
@@ -128,6 +128,8 @@ endif
 # Building one way
 define build-rts-way # args: $1 = way
 
+ifneq "$$(BINDIST)" "YES"
+
 # The per-way CC_OPTS
 ifneq "$$(findstring debug, $1)" ""
 rts_dist_$1_HC_OPTS =
@@ -160,19 +162,19 @@ rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ)
 
 # Making a shared library for the RTS.
 ifneq "$$(findstring dyn, $1)" ""
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
 	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(rts_dist_HC)" -shared -dynamic -dynload deploy \
+	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
 	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
-ifeq "$(darwin_TARGET_OS)" "1"
+ifeq "$$(darwin_TARGET_OS)" "1"
 	# Ensure library's install name is correct before anyone links with it.
 	install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@
 endif
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(rts_dist_HC)" -shared -dynamic -dynload deploy \
+	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
 	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
 endif
 else
@@ -181,6 +183,8 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS)
 	echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
 endif
 
+endif
+
 endef
 
 # And expand the above for each way:
@@ -203,7 +207,6 @@ WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 WARNING_OPTS += -Wpointer-arith
 WARNING_OPTS += -Wmissing-noreturn
-WARNING_OPTS += -Wcast-align
 WARNING_OPTS += -Wnested-externs
 WARNING_OPTS += -Wredundant-decls 
 
@@ -213,6 +216,15 @@ WARNING_OPTS += -Wredundant-decls
 #WARNING_OPTS += -Wshadow
 #WARNING_OPTS += -Wcast-qual
 
+# This one seems buggy on GCC 4.1.2, which is the only GCC version we 
+# have that can bootstrap the SPARC build. We end up with lots of supurious
+# warnings of the form "cast increases required alignment of target type".
+# Some legitimate warnings can be fixed by adding an intermediate cast to
+# (void*), but we get others in rts/sm/GCUtils.c concerning the gct var
+# that look innocuous to me. We could enable this again once we deprecate
+# support for registerised builds on this arch. -- BL 2010/02/03
+# WARNING_OPTS += -Wcast-align
+
 STANDARD_OPTS += -Iincludes -Irts
 # COMPILING_RTS is only used when building Win32 DLL support.
 STANDARD_OPTS += -DCOMPILING_RTS
@@ -311,7 +323,6 @@ rts/RetainerSet_CC_OPTS += -Wno-format
 # On Windows:
 rts/win32/ConsoleHandler_CC_OPTS += -w
 rts/win32/ThrIOManager_CC_OPTS += -w
-rts/win32/Ticker_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
@@ -417,8 +428,10 @@ endif
 # -----------------------------------------------------------------------------
 # build the static lib containing the C main symbol
 
+ifneq "$(BINDIST)" "YES"
 rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
 	"$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $<
+endif
 
 # -----------------------------------------------------------------------------
 # The RTS package config
@@ -441,13 +454,7 @@ endif
 # -----------------------------------------------------------------------------
 # installing
 
-install : install_rts
-
-.PHONY: install_rts
-install_rts:
-	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)"
-	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/include"
-	"$(CP)" $(ALL_RTS_LIBS) "$(DESTDIR)$(ghclibdir)"
+INSTALL_LIBS += $(ALL_RTS_LIBS)
 
 # -----------------------------------------------------------------------------
 # cleaning