diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-11-12 01:29:27 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-12 21:28:02 -0500 |
| commit | c60652929ebd2510e52c05a2f61d52e2bf1846ad (patch) | |
| tree | 470e0d797b802c65b470ad5fd592c3347a462977 | |
| parent | b040d0d4f1aab4fda1b862fa1f81df1aee8372d4 (diff) | |
| download | haskell-c60652929ebd2510e52c05a2f61d52e2bf1846ad.tar.gz | |
Make: Move remaining built RTS headers to ...build/include
This allows us to clean up the rts include dirs in the package conf.
| -rw-r--r-- | libffi/ghc.mk | 4 | ||||
| -rw-r--r-- | rts/ghc.mk | 2 | ||||
| -rw-r--r-- | rts/package.conf.in | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 8226057646..c82cb783e3 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -32,8 +32,8 @@ libffi_EnableShared = no endif libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a -libffi_HEADERS = rts/dist-install/build/ffi.h \ - rts/dist-install/build/ffitarget.h +libffi_HEADERS = rts/dist-install/build/include/ffi.h \ + rts/dist-install/build/include/ffitarget.h ifeq "$(HostOS_CPP)" "mingw32" LIBFFI_NAME = ffi-6 diff --git a/rts/ghc.mk b/rts/ghc.mk index b4cef0956c..3643e07e9e 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -99,7 +99,7 @@ $(rts_AUTO_APPLY_CMM): $$(genapply_INPLACE) rts_H_FILES := $(wildcard rts/*.h rts/*/*.h) ifeq "$(USE_DTRACE)" "YES" -DTRACEPROBES_H = rts/dist-install/build/RtsProbes.h +DTRACEPROBES_H = rts/dist-install/build/include/RtsProbes.h rts_H_FILES += $(DTRACEPROBES_H) endif diff --git a/rts/package.conf.in b/rts/package.conf.in index 46103e49b9..1d3611f930 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -70,11 +70,10 @@ extra-libraries: #if defined(INSTALLING) include-dirs: INCLUDE_DIR FFI_INCLUDE_DIR #else /* !INSTALLING */ -include-dirs: TOP"/rts/dist-install/build" - TOP"/rts/include" +include-dirs: TOP"/rts/include" + TOP"/rts/dist-install/build/include" FFI_INCLUDE_DIR LIBDW_INCLUDE_DIR - TOP"/rts/dist-install/build/include" #endif includes: Stg.h |