X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=07707e5b95078a5248e5d3ad160cf63751e48e91;hb=9c5f23d4e31b06a3d6ec8eca7c82934571c348de;hp=4ff8d8cdd054ed9e9323029eecf79bb92588b75c;hpb=39a991713f0705bf2599930e378178a1d6e2b5f9;p=ghc-hetmet.git diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 4ff8d8c..07707e5 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.38 2000/11/01 11:41:47 simonmar Exp $ +# $Id: Makefile,v 1.54 2001/07/23 23:27:50 ken Exp $ # # This is the Makefile for the runtime-system stuff. # This stuff is written in C (and cannot be written in Haskell). @@ -26,47 +26,47 @@ SRCS_RTS_C = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan SRCS_RTS_S = $(wildcard *.S) SRCS_RTS_HC = $(wildcard *.hc) $(wildcard parallel/*.hc) -ifneq "$(way)" "dll" +ifneq "$(DLLized)" "YES" SRCS_RTS_C := $(filter-out RtsDllMain.c, $(SRCS_RTS_C)) else SRCS_RTS_C := $(filter-out Main.c, $(SRCS_RTS_C)) endif -#----------------------------------------------------------------------------- -# creating and installing libHSrts.a (in its many flavors) -# -LIBRARY = libHSrts$(_way).a LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \ $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \ $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S)) +#----------------------------------------------------------------------------- +# Flags for compiling RTS .c and .hc files + # gcc provides lots of useful warnings if you ask it. # This is a pretty good list to start with - use a # to comment out # any you don't like. -WARNING_OPTS += -optc-Wall -WARNING_OPTS += -optc-W -WARNING_OPTS += -optc-Wstrict-prototypes -WARNING_OPTS += -optc-Wmissing-prototypes -WARNING_OPTS += -optc-Wmissing-declarations -WARNING_OPTS += -optc-Winline -WARNING_OPTS += -optc-Waggregate-return -#WARNING_OPTS += -optc-Wpointer-arith -WARNING_OPTS += -optc-Wbad-function-cast -#WARNING_OPTS += -optc-Wcast-align -#WARNING_OPTS += -optc-Wnested-externs -#WARNING_OPTS += -optc-Wshadow -#WARNING_OPTS += -optc-Wcast-qual -#WARNING_OPTS += -optc-Wno-unused -#WARNING_OPTS += -optc-Wredundant-decls -#WARNING_OPTS += -optc-Wconversion - -SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS -SRC_CC_OPTS = $(GhcRtsCcOpts) - -ifneq "$(way)" "dll" +WARNING_OPTS += -Wall +WARNING_OPTS += -W +WARNING_OPTS += -Wstrict-prototypes +WARNING_OPTS += -Wmissing-prototypes +WARNING_OPTS += -Wmissing-declarations +WARNING_OPTS += -Winline +WARNING_OPTS += -Waggregate-return +#WARNING_OPTS += -Wpointer-arith +WARNING_OPTS += -Wbad-function-cast +WARNING_OPTS += -Wcast-align +#WARNING_OPTS += -Wnested-externs +#WARNING_OPTS += -Wshadow +#WARNING_OPTS += -Wcast-qual +#WARNING_OPTS += -Wno-unused +#WARNING_OPTS += -Wredundant-decls +#WARNING_OPTS += -Wconversion + +SRC_CC_OPTS += $(GhcRtsCcOpts) $(WARNING_OPTS) -DCOMPILING_RTS + +SRC_HC_OPTS += -I../includes -I. -Iparallel $(GhcRtsHcOpts) -DCOMPILING_RTS + +ifneq "$(DLLized)" "YES" SRC_HC_OPTS += -static endif -# SRC_HC_OPTS += -optc-fPIC +# SRC_HC_OPTS += -fPIC ifeq "$(way)" "mp" SRC_HC_OPTS += -I$$PVM_ROOT/include @@ -75,17 +75,15 @@ endif #----------------------------------------------------------------------------- # Include the Front panel code? +SRCS_RTS_C := $(filter-out Vis%.c, $(SRCS_RTS_C)) + # we need GTK+ for the front panel ifneq "$(GTK_CONFIG)" "" - ifeq "$(GhcRtsWithFrontPanel)" "YES" -SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL -else -SRCS_RTS_C := $(filter-out Vis*.c, $(SRCS_RTS_C)) -endif - -VisCallbacks_CC_OPTS = -optc-Wno-unused - +SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL +SRCS_RTS_C := $(SRCS_RTS_C) $(wildcard Vis*.c) +VisCallbacks_CC_OPTS += -Wno-unused +endif # GhcRtsWithFrontPanel endif # GTK_CONFIG #----------------------------------------------------------------------------- @@ -103,7 +101,16 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes # ../driver/ghc (a better C compiler :-) to compile the # different RTS pieces # -CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS) + +ifeq "$(BootingFromHc)" "YES" +# use the normal $(CC) when booting from .hc files +SRC_CC_OPTS += $(HC_OPTS) +else +# otherwise, use $(GHC_INPLACE) as the C compiler. +CC=$(GHC_INPLACE) +CC_OPTS := $(addprefix -optc, $(CC_OPTS)) $(HC_OPTS) +endif + HC=$(GHC_INPLACE) # prevent this value from leaking into the GMP makefile @@ -112,15 +119,15 @@ unexport CC # ----------------------------------------------------------------------------- # # Building DLLs is only supported on mingw32 at the moment. -# -DLL_NAME = HSrts.dll -ifeq "$(way)" "dll" -DLL_IMPLIB_NAME = libHSrts_imp.a +# +PACKAGE = rts -SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \ - -lHS_imp_stub -lgmp_imp +ifeq "$(DLLized)" "YES" +SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp + +# It's not included in the DLL, but we need to compile it up separately. +all :: Main.dll_o -# # Need an import library containing the symbols the RTS uses from the Prelude. # So, to avoid bootstrapping trouble, we build one containing just the syms # we need. Weirdly named to avoid clashing later on when compiling the contents @@ -129,14 +136,11 @@ SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \ # Note: if you do change the name of the Prelude DLL, the "--dllname .dll" # below will need to be updated as well. -$(DLL_PEN)/$(DLL_NAME) :: libHS_imp_stub.a +$(DLL_PEN)/HSrts$(_way).dll :: libHS_imp_stub.a libHS_imp_stub.a : dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll -# It's not included in the DLL, but we need to compile it up separately. -all :: Main.dll_o - endif # ----------------------------------------------------------------------------- @@ -146,33 +150,42 @@ endif # and not worth re-implementing in our Makefile framework. ifneq "$(HaveLibGmp)" "YES" +ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" boot :: - cd gmp && ./configure --enable-shared=no --target=$(HOSTPLATFORM) + cd gmp && ./configure --enable-shared=no \ + --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'` +else +# Pass --target to configure of GMP, so that building for mingwin under +# cygwin works properly (when the host is not the same as the target) +boot :: + cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM) +endif -# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc. +# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc. all :: gmp/libgmp.a -ifeq "$(way)" "dll" +ifeq "$(DLLized)" "YES" all :: $(DLL_PEN)/gmp.dll $(DLL_PEN)/gmp.dll: - make -C gmp gmp.dll + $(MAKE) -C gmp gmp.dll $(MV) gmp/gmp.dll $(DLL_PEN) endif install :: gmp/libgmp.a -clean :: - $(MAKE) -C gmp MAKEFLAGS= clean - ifeq "$(way)" "" +clean distclean maintainer-clean :: + -$(MAKE) -C gmp MAKEFLAGS= $@ + INSTALL_LIBS += gmp/libgmp.a endif gmp/libgmp.a :: $(MAKE) -C gmp MAKEFLAGS= @$(CP) gmp/.libs/libgmp.a gmp + @$(RANLIB) gmp/libgmp.a endif #----------------------------------------------------------------------------- @@ -204,13 +217,10 @@ endif # Just libHSrts is installed uniformly across ways # INSTALL_LIBS += $(LIBRARY) -ifeq "$(EnableWin32DLLs)" "YES" +ifeq "$(DLLized)" "YES" INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll -ifneq "$(way)" "dll" -INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY)) -endif +INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY)) INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o endif include $(TOP)/mk/target.mk -