diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-04-07 04:16:31 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-04-07 04:16:31 +0000 |
| commit | 968208c11c76726e84f2dc89ba039c85b0600543 (patch) | |
| tree | 3b1721a2e9edb16e6dbf762792dc74bb78ea5699 /libraries/base | |
| parent | b17768ea2055297b376616577b9a6214ce920a31 (diff) | |
| download | haskell-968208c11c76726e84f2dc89ba039c85b0600543.tar.gz | |
Track the GHC source tree reorganisation
Diffstat (limited to 'libraries/base')
| -rw-r--r-- | libraries/base/Makefile | 10 | ||||
| -rw-r--r-- | libraries/base/cbits/Makefile | 2 | ||||
| -rw-r--r-- | libraries/base/cbits/lockFile.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libraries/base/Makefile b/libraries/base/Makefile index cf5917c482..db0aa2f804 100644 --- a/libraries/base/Makefile +++ b/libraries/base/Makefile @@ -40,7 +40,7 @@ PACKAGE = base VERSION = 1.0 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h -SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes +SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Per-module flags @@ -51,7 +51,7 @@ SRC_HC_OPTS += -funbox-strict-fields # ----------------------------------------------------------------------------- # PrimOpWrappers -# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt +# These two lines are required for pre-processing compiler/prelude/primops.txt SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) SRC_CPP_OPTS += ${GhcCppOpts} @@ -61,12 +61,12 @@ GHC/PrimopWrappers.hs: GHC/Prim.hs else GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs @$(RM) $@ - $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@ + $(GENPRIMOP) --make-haskell-wrappers < $< > $@ endif GHC/Prim.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt @$(RM) $@ - $(GHC_GENPRIMOP) --make-haskell-source < $< > $@ + $(GENPRIMOP) --make-haskell-source < $< > $@ EXCLUDED_SRCS = GHC/Prim.hs EXTRA_HADDOCK_SRCS = GHC/Prim.hs @@ -80,7 +80,7 @@ CLEAN_FILES += GHC/PrimopWrappers.hs ifneq "$(BootingFromHc)" "YES" STUBOBJS += \ Control/Concurrent_stub.$(way_)o - + CLEAN_FILES += $(STUBOBJS) \ Control/Concurrent_stub.[ch] endif diff --git a/libraries/base/cbits/Makefile b/libraries/base/cbits/Makefile index b1bbba6ebc..0082ae79a0 100644 --- a/libraries/base/cbits/Makefile +++ b/libraries/base/cbits/Makefile @@ -20,7 +20,7 @@ EXCLUDED_SRCS += consUtils.c endif SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB -SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -I../include +SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RTS_DIR) -I../include LIBRARY = libHSbase_cbits.a LIBOBJS = $(C_OBJS) diff --git a/libraries/base/cbits/lockFile.c b/libraries/base/cbits/lockFile.c index e892ed4ee8..bf0a0f07cd 100644 --- a/libraries/base/cbits/lockFile.c +++ b/libraries/base/cbits/lockFile.c @@ -10,7 +10,7 @@ #include "HsBase.h" #include "Rts.h" -#include "../../ghc/rts/RtsUtils.h" // for barf() +#include "RtsUtils.h" typedef struct { dev_t device; |