Commit 0065d5ab authored by Simon Marlow's avatar Simon Marlow
Browse files

Reorganisation of the source tree

Most of the other users of the fptools build system have migrated to
Cabal, and with the move to darcs we can now flatten the source tree
without losing history, so here goes.

The main change is that the ghc/ subdir is gone, and most of what it
contained is now at the top level.  The build system now makes no
pretense at being multi-project, it is just the GHC build system.

No doubt this will break many things, and there will be a period of
instability while we fix the dependencies.  A straightforward build
should work, but I haven't yet fixed binary/source distributions.
Changes to the Building Guide will follow, too.
parent 28a464a7
TOP=../..
TOP=..
include $(TOP)/mk/boilerplate.mk
ALL_DIRS = \
......
# Settings for using the libghccompat.a library elsewhere in the build
# tree: this file is just included into Makefiles, see
# ghc/utils/ghc-pkg/Makefile for example.
# utils/ghc-pkg/Makefile for example.
#
# This is a poor-mans package, but simpler because we don't
# have to deal with variations in the package support of different
# versions of GHC.
# Use libghccompat.a:
SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
SRC_HC_OPTS += -i$(GHC_COMPAT_DIR)
SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
# Do *not* use the installed Cabal:
ifeq "$(ghc_ge_603)" "YES"
......@@ -16,7 +16,7 @@ SRC_HC_OPTS += -ignore-package Cabal
endif
# And similarly for when booting from .hc files:
HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR)
HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR)
HC_BOOT_LIBS += -lghccompat
ifeq "$(Windows)" "YES"
......@@ -30,6 +30,7 @@ endif
SRC_MKDEPENDHS_OPTS += \
-optdep--exclude-module=Compat.RawSystem \
-optdep--exclude-module=Compat.Directory \
-optdep--exclude-module=Compat.Unicode \
-optdep--exclude-module=Distribution.Compat.FilePath \
-optdep--exclude-module=Distribution.Compat.ReadP \
-optdep--exclude-module=Distribution.Extension \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment