# build the libs first if we're bootstrapping from .hc files
ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils hslibs ghc green-card happy hdirect hood nofib
+AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib
else
-AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib
endif
#
#
# NOTE: this is not the same as building the compiler itself
# unregisterised. That's done by either (a) bootstrapping with a
-# compiler that was built with GhcUnregisterized=YES, or (b)
+# compiler that was built with GhcUnregisterised=YES, or (b)
# bootstrapping with a compiler that has way 'u' libraries, and the
# flag '-unreg' is added to GhcHcOpts above.
#
GhcWithJavaGen=NO
HaveLibDL = @HaveLibDL@
+HaveRtldNext = @HaveRtldNext@
+HaveRtldLocal = @HaveRtldLocal@
# Include GHCi in the compiler. Default to NO for the time being.
GhcLibWays=p
endif
-# Option flags to pass to GHC when it's compiling prelude modules
-# *and* standard library modules (std) *and* modules in hslibs
-# Typically these are things like -O or -dcore-lint
-# The ones that are *essential* are wired into ghc/lib/Makefile
+# Option flags to pass to GHC when it's compiling modules in
+# fptools/libraries. Typically these are things like -O or
+# -dcore-lint or -H32m. The ones that are *essential* are wired into
+# the build system.
#
# -O is pretty desirable, otherwise no inlining of prelude
# things (incl "+") happens when compiling with this compiler
################################################################################
#
-# hslibs project
+# libraries project
#
################################################################################
-# Build HsLibs for which compiler?
-
-# If $(HsLibsFor) == hugs or ghc, we assume we're building for the
-# compiler/interpreter in the same source tree.
-
-# HsLibsFor = ghc | hugs | nhc | hbc
-HsLibsFor = ghc
-
-# hslibs for GHC also uses the following variables (defined above):
-# GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
-
# Build the Haskell Readline bindings?
#
GhcLibsWithReadline=@HaveReadlineHeaders@
# Build the Haskell OpenGL/GLUT binding?
#
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GL_CFLAGS=@GL_CFLAGS@
+GL_LIBS=@GL_LIBS@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
LibGmp = @LibGmp@
#-----------------------------------------------------------------------------
-# Regex library
+# Regex libraries
# (if present in libc use that one, otherwise use the one in the tree)
#
-HaveRegex = @HaveRegex@
+HavePosixRegex = @HavePosixRegex@
+HaveGNURegex = @HaveGNURegex@
#-----------------------------------------------------------------------------
# GTK+