[project @ 2004-11-14 09:50:33 by krasimir]

[ghc-hetmet.git] / ghc / lib / compat / Makefile

diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index 081ea78..94188dd 100644 (file)
--- a/ghc/lib/compat/Makefile
+++ b/ghc/lib/compat/Makefile
@@ -1,15 +1,3 @@
-# 
-# This library contains modules only available in versions of GHC
-# newer than the current one.  They are implemented as stubs that
-# #include the actual code from fptools/libraries.
-#
-# The idea is to ease the task of writing portable code in GHC and its
-# tools: the client can link with libghccompat.a and assume that all
-# the modules are available.  In this way we can add modules to the library
-# and start using them right away in GHC, as long as the new library modules
-# can be compiled using older versions of GHC.
-#
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
@@ -33,6 +21,7 @@ ifeq "$(ghc_603_plus)" "YES"
 # These modules are all provided in GHC 6.3+
 EXCLUDED_SRCS += \
        Data/Version.hs \
+       System/FilePath.hs \
        Distribution/Compat/Error.hs \
        Distribution/Compat/ReadP.hs \
        Distribution/Extension.hs \
@@ -49,4 +38,13 @@ SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
 
 SRC_HC_OPTS +=  -fglasgow-exts
 
+# libghccompat is needed to build ghc-pkg, which is built during 'make boot',
+# so we must build this library during 'make boot' too.
+# Do a recursive 'make all' after generating dependencies, because this
+# will work with 'make -j'.
+ifneq "$(BootingFromHc)" "YES"
+boot :: depend
+       $(MAKE) all
+endif
+
 include $(TOP)/mk/target.mk