diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | ghc.mk | 4 | ||||
| -rw-r--r-- | mk/tree.mk | 2 | ||||
| -rw-r--r-- | rts/include/ghc.mk | 20 | ||||
| -rw-r--r-- | rts/package.conf.in | 3 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 2 |
6 files changed, 15 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index f66faf033e..c860ecd9cb 100644 --- a/.gitignore +++ b/.gitignore @@ -80,9 +80,8 @@ _darcs/ /libraries/*/dist-install/ /libraries/*/dist-newstyle/ /libraries/dist-haddock/ -/rts/dist-install/ -/rts/include/dist/ -/rts/include/dist-*/ +/rts/dist/ +/rts/dist-*/ /utils/*/dist*/ /compiler/stage1/ /compiler/stage2/ @@ -188,7 +187,6 @@ _darcs/ /mk/project.mk /mk/project.mk.old /mk/validate.mk -/rts/include/dist/ /rts/rts.cabal /rts/package.conf.inplace /rts/package.conf.inplace.raw @@ -1349,7 +1349,6 @@ clean : clean_files clean_libraries clean_files : $(call removeFiles,$(CLEAN_FILES)) # this is here since CLEAN_FILES can't handle folders - $(call removeTrees,rts/include/dist-derivedconstants) $(call removeTrees,inplace/bin) $(call removeTrees,inplace/lib) $(call removeTrees,libraries/bootstrapping.conf) @@ -1434,9 +1433,6 @@ distclean : clean $(call removeFiles,bindist-list.uniq) $(call removeTrees,bindisttest/a) -# Not sure why this is being cleaned here. - $(call removeTrees,rts/include/dist-derivedconstants) - # Also clean Windows-only inplace directories. # Don't delete 'inplace' itself, it contains source files. $(call removeTrees,inplace/mingw) diff --git a/mk/tree.mk b/mk/tree.mk index d2613b2a41..216cc8ba2b 100644 --- a/mk/tree.mk +++ b/mk/tree.mk @@ -10,7 +10,7 @@ # indicates a directory relative to the top of the source tree. GHC_UTILS_DIR = utils -GHC_INCLUDE_DIRS = rts/include rts/include/dist rts/include/dist-derivedconstants/header +GHC_INCLUDE_DIRS = rts/include rts/dist-install/build/include GHC_RTS_DIR = rts GHC_DRIVER_DIR = driver diff --git a/rts/include/ghc.mk b/rts/include/ghc.mk index f44f970bb5..4482446aea 100644 --- a/rts/include/ghc.mk +++ b/rts/include/ghc.mk @@ -13,20 +13,20 @@ # # Header files built from the configure script's findings # -includes_0_H_CONFIG = rts/include/dist/build/ghcautoconf.h -includes_1_H_CONFIG = rts/include/dist-install/build/ghcautoconf.h +includes_0_H_CONFIG = rts/dist/build/include/ghcautoconf.h +includes_1_H_CONFIG = rts/dist-install/build/include/ghcautoconf.h includes_2_H_CONFIG = $(includes_1_H_CONFIG) -includes_0_H_PLATFORM = rts/include/dist/build/ghcplatform.h -includes_1_H_PLATFORM = rts/include/dist-install/build/ghcplatform.h +includes_0_H_PLATFORM = rts/dist/build/include/ghcplatform.h +includes_1_H_PLATFORM = rts/dist-install/build/include/ghcplatform.h includes_2_H_PLATFORM = $(includes_1_H_PLATFORM) -includes_0_H_VERSION = rts/include/dist/build/ghcversion.h -includes_1_H_VERSION = rts/include/dist-install/build/ghcversion.h +includes_0_H_VERSION = rts/dist/build/include/ghcversion.h +includes_1_H_VERSION = rts/dist-install/build/include/ghcversion.h includes_2_H_VERSION = $(includes_1_H_VERSION) -BUILD_0_INCLUDE_DIR = rts/include/dist/build -BUILD_1_INCLUDE_DIR = rts/include/dist-install/build +BUILD_0_INCLUDE_DIR = rts/dist/build/include +BUILD_1_INCLUDE_DIR = rts/dist-install/build/include BUILD_2_INCLUDE_DIR = $(BUILD_1_INCLUDE_DIR) # @@ -205,7 +205,7 @@ $(eval $(call includesHeaderPlatform,1)) # rebuilds. # See Note [tooldir: How GHC finds mingw on Windows] -includes_SETTINGS = rts/include/dist/build/settings +includes_SETTINGS = rts/dist-install/build/include/settings # N.B. this is duplicated in hadrian/bindist/Makefile. $(includes_SETTINGS) : rts/include/Makefile | $$(dir $$@)/. @@ -268,7 +268,7 @@ $(includes_SETTINGS) : rts/include/Makefile | $$(dir $$@)/. # --------------------------------------------------------------------------- # Make DerivedConstants.h for the compiler -includes_DERIVEDCONSTANTS = rts/include/dist-derivedconstants/header/DerivedConstants.h +includes_DERIVEDCONSTANTS = rts/dist-install/build/include/DerivedConstants.h DERIVE_CONSTANTS_FLAGS_FOR_HEADER += --gcc-program "$(CC)" DERIVE_CONSTANTS_FLAGS_FOR_HEADER += $(addprefix --gcc-flag$(space),$(includes_CC_OPTS) -fcommon) diff --git a/rts/package.conf.in b/rts/package.conf.in index a5db5668c6..69ee9ba54d 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -72,10 +72,9 @@ include-dirs: INCLUDE_DIR FFI_INCLUDE_DIR #else /* !INSTALLING */ include-dirs: TOP"/rts/dist-install/build" TOP"/rts/include" - TOP"/rts/include/dist-derivedconstants/header" FFI_INCLUDE_DIR LIBDW_INCLUDE_DIR - TOP"/rts/include/dist-install/build" + TOP"/rts/dist-install/build/include" #endif includes: Stg.h diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index d1f5681d79..a2f78f15b6 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -145,7 +145,7 @@ library cpp-options: -DNOSMP include-dirs: build include - include/dist-derivedconstants/header @FFIIncludeDir@ + @FFIIncludeDir@ @LibdwIncludeDir@ includes: Stg.h install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h |