projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-03-02 19:50:12 by sof]
[ghc-hetmet.git]
/
ghc
/
rts
/
Makefile
diff --git
a/ghc/rts/Makefile
b/ghc/rts/Makefile
index
83bc744
..
54fa5fc
100644
(file)
--- a/
ghc/rts/Makefile
+++ b/
ghc/rts/Makefile
@@
-1,5
+1,5
@@
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.2 1998/12/02 13:28:32 simonm Exp $
+# $Id: Makefile,v 1.6 1999/03/01 17:41:50 simonm Exp $
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
@@
-54,11
+54,10
@@
WARNING_OPTS += -optc-Wbad-function-cast
#WARNING_OPTS += -optc-Wconversion
SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts)
#WARNING_OPTS += -optc-Wconversion
SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts)
-SRC_CC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsCcOpts)
+SRC_CC_OPTS += $(GhcRtsCcOpts)
ifeq "$(way)" "mp"
SRC_HC_OPTS += -I$$PVM_ROOT/include
ifeq "$(way)" "mp"
SRC_HC_OPTS += -I$$PVM_ROOT/include
-SRC_CC_OPTS += -I$$PVM_ROOT/include
endif
C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) # $(SRCS_RTS_S)???
endif
C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) # $(SRCS_RTS_S)???
@@
-74,7
+73,7
@@
SRC_MKDEPENDC_OPTS += -I. -I../includes
# ../driver/ghc (a better C compiler :-) to compile the
# different RTS pieces
#
# ../driver/ghc (a better C compiler :-) to compile the
# different RTS pieces
#
-CC=$(HC) $($*_HC_OPTS)
+CC=$(HC) $(HC_OPTS) $($*_HC_OPTS)
# prevent this value from leaking into the GMP makefile
unexport CC
# prevent this value from leaking into the GMP makefile
unexport CC
@@
-93,6
+92,9
@@
all :: gmp/libgmp.a
install :: gmp/libgmp.a
install :: gmp/libgmp.a
+clean ::
+ $(MAKE) -C gmp MAKEFLAGS= clean
+
ifeq "$(way)" ""
INSTALL_LIBS += gmp/libgmp.a
endif
ifeq "$(way)" ""
INSTALL_LIBS += gmp/libgmp.a
endif