44796a62d6
Changes from 1.16: # New: Several more packages of hierarchical libraries are included in the build: base, parsec, haskell-src, QuickCheck, HaXml, HUnit, Cabal. # New: FFI improvements: foreign import "dynamic" is now supported, and named C header-files are now used. # New: The compiler now uses cpphs for Haskell source instead of cpp. This removes problems with string gaps, primes in identifiers, and so on. # New: In hmake-interactive, if the readline library is not available, the simple line editor now has a history mechanism. # Bugfix: hmake's processing of cpp conditional directives is improved also. # Bugfix: More evil bugfixes for gcc versions ? 3.3 # Bugfix: A numeric pattern can now match against a Num newtype. # Bugfix: Foreign imports and abstract newtypes now play OK together. # Bugfix: Methods in qualified classes no longer need to be qualified in instance decls. # Bugfix: GreenCard now accepts <<.../...>> syntax.
117 lines
5.4 KiB
Text
117 lines
5.4 KiB
Text
$NetBSD: patch-ah,v 1.2 2005/05/01 22:55:07 kristerw Exp $
|
|
|
|
--- Makefile.orig 2005-04-21 22:10:31.000000000 +0200
|
|
+++ Makefile 2005-04-21 22:16:30.000000000 +0200
|
|
@@ -140,13 +140,13 @@
|
|
|
|
TARGDIR= targets
|
|
TARGETS= runtime prelude libraries greencard hp2graph hsc2hs cpphs \
|
|
- profruntime profprelude profprelude-$(CC) \
|
|
- timeruntime timeprelude timeprelude-$(CC) \
|
|
- proflibraries timelibraries proflibraries-$(CC) timelibraries-$(CC) \
|
|
- compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \
|
|
- hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \
|
|
- greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \
|
|
- prelude-$(CC) pragma-$(CC) libraries-$(CC) hsc2hs-$(CC) cpphs-$(CC)
|
|
+ profruntime profprelude profprelude-gcc \
|
|
+ timeruntime timeprelude timeprelude-gcc \
|
|
+ proflibraries timelibraries proflibraries-gcc timelibraries-gcc \
|
|
+ compiler-nhc compiler-hbc compiler-ghc compiler-gcc \
|
|
+ hmake-nhc hmake-hbc hmake-ghc hmake-gcc \
|
|
+ greencard-nhc greencard-hbc greencard-ghc greencard-gcc \
|
|
+ prelude-gcc pragma-gcc libraries-gcc hsc2hs-gcc cpphs-gcc
|
|
|
|
.PHONY: default basic all compiler help config install
|
|
|
|
@@ -186,8 +186,8 @@
|
|
prelude hsc2hs libraries
|
|
basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc cpphs \
|
|
prelude hsc2hs libraries
|
|
-basic-$(CC): runtime prelude-$(CC) pragma-$(CC) cpphs-$(CC) compiler-$(CC) \
|
|
- greencard-$(CC) hmake-$(CC) hsc2hs-$(CC) libraries-$(CC)
|
|
+basic-gcc: runtime prelude-gcc pragma-gcc cpphs-gcc compiler-gcc \
|
|
+ greencard-gcc hmake-gcc hsc2hs-gcc libraries-gcc
|
|
|
|
all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #hoodui
|
|
|
|
@@ -309,56 +309,56 @@
|
|
done && touch $(TARGDIR)/$(MACHINE)/timelibraries
|
|
|
|
|
|
-$(TARGDIR)/$(MACHINE)/prelude-$(CC): $(PRELUDEC)
|
|
+$(TARGDIR)/$(MACHINE)/prelude-gcc: $(PRELUDEC)
|
|
cd src/prelude; $(MAKE) fromC relink
|
|
- touch $(TARGDIR)/$(MACHINE)/prelude-$(CC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/prelude-gcc
|
|
touch $(TARGDIR)/$(MACHINE)/prelude
|
|
-$(TARGDIR)/$(MACHINE)/timeprelude-$(CC): $(PRELUDEC)
|
|
+$(TARGDIR)/$(MACHINE)/timeprelude-gcc: $(PRELUDEC)
|
|
cd src/prelude; $(MAKE) CFG=z fromC
|
|
cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=z clean all
|
|
cd src/prelude; $(MAKE) CFG=z relink
|
|
- touch $(TARGDIR)/$(MACHINE)/timeprelude-$(CC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/timeprelude-gcc
|
|
touch $(TARGDIR)/$(MACHINE)/timeprelude
|
|
-$(TARGDIR)/$(MACHINE)/profprelude-$(CC): $(PRELUDEC)
|
|
+$(TARGDIR)/$(MACHINE)/profprelude-gcc: $(PRELUDEC)
|
|
cd src/prelude; $(MAKE) CFG=p fromC
|
|
cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=p clean all
|
|
cd src/prelude; $(MAKE) CFG=p relink
|
|
- touch $(TARGDIR)/$(MACHINE)/profprelude-$(CC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/profprelude-gcc
|
|
touch $(TARGDIR)/$(MACHINE)/profprelude
|
|
-$(TARGDIR)/$(MACHINE)/compiler-$(CC): $(COMPILERC)
|
|
+$(TARGDIR)/$(MACHINE)/compiler-gcc: $(COMPILERC)
|
|
cd src/compiler98; $(MAKE) fromC
|
|
cd src/prelude/$(MACHINE)/NHC; $(MAKE) clean all # Patch machine-specific parts.
|
|
cd src/prelude; $(MAKE) relink
|
|
cd src/compiler98; $(MAKE) relink
|
|
- touch $(TARGDIR)/$(MACHINE)/compiler-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/greencard-$(CC): $(GREENCARDC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/compiler-gcc
|
|
+$(TARGDIR)/$(MACHINE)/greencard-gcc: $(GREENCARDC)
|
|
cd src/greencard; $(MAKE) fromC
|
|
- touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/pragma-$(CC): script/hmake-PRAGMA.hc
|
|
+ touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-gcc
|
|
+$(TARGDIR)/$(MACHINE)/pragma-gcc: script/hmake-PRAGMA.hc
|
|
script/nhc98 -o $(PRAGMA) script/hmake-PRAGMA.hc
|
|
- touch $(TARGDIR)/$(MACHINE)/pragma-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/cpphs-$(CC): $(CPPHS)
|
|
+ touch $(TARGDIR)/$(MACHINE)/pragma-gcc
|
|
+$(TARGDIR)/$(MACHINE)/cpphs-gcc: $(CPPHS)
|
|
cd src/cpphs; $(MAKE) -f Makefile.nhc98 fromC
|
|
- touch $(TARGDIR)/$(MACHINE)/cpphs-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/cpphs-gcc
|
|
+$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC)
|
|
cd src/hmake; $(MAKE) BUILDCOMP=nhc fromC config
|
|
cd src/interpreter; $(MAKE) BUILDCOMP=nhc fromC
|
|
- touch $(TARGDIR)/$(MACHINE)/hmake-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/hsc2hs-$(CC): $(HSC2HS) $(HSC2HSC)
|
|
+ touch $(TARGDIR)/$(MACHINE)/hmake-gcc
|
|
+$(TARGDIR)/$(MACHINE)/hsc2hs-gcc: $(HSC2HS) $(HSC2HSC)
|
|
cd src/hsc2hs; $(MAKE) -f Makefile.nhc98 fromC
|
|
- touch $(TARGDIR)/$(MACHINE)/hsc2hs-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/libraries-$(CC): $(LIBRARIES)
|
|
+ touch $(TARGDIR)/$(MACHINE)/hsc2hs-gcc
|
|
+$(TARGDIR)/$(MACHINE)/libraries-gcc: $(LIBRARIES)
|
|
for pkg in ${PACKAGEBUILD};\
|
|
do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 fromC; ) ;\
|
|
- done && touch $(TARGDIR)/$(MACHINE)/libraries-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/proflibraries-$(CC): $(LIBRARIES)
|
|
+ done && touch $(TARGDIR)/$(MACHINE)/libraries-gcc
|
|
+$(TARGDIR)/$(MACHINE)/proflibraries-gcc: $(LIBRARIES)
|
|
for pkg in ${PACKAGEBUILD};\
|
|
do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 CFG=p fromC; ) ;\
|
|
- done && touch $(TARGDIR)/$(MACHINE)/proflibraries-$(CC)
|
|
-$(TARGDIR)/$(MACHINE)/timelibraries-$(CC): $(LIBRARIES)
|
|
+ done && touch $(TARGDIR)/$(MACHINE)/proflibraries-gcc
|
|
+$(TARGDIR)/$(MACHINE)/timelibraries-gcc: $(LIBRARIES)
|
|
for pkg in ${PACKAGEBUILD};\
|
|
do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 CFG=z fromC; ) ;\
|
|
- done && touch $(TARGDIR)/$(MACHINE)/timelibraries-$(CC)
|
|
+ done && touch $(TARGDIR)/$(MACHINE)/timelibraries-gcc
|
|
|
|
|
|
script/errnogen.c: script/GenerateErrNo.hs
|