diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-26 16:06:28 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-06 08:05:57 -0500 |
| commit | ce9e2a1a9307bf43ead278dd1fc8db4325d82340 (patch) | |
| tree | bd134ac511b2d20755290d9b63505cffeb2a9518 /rts | |
| parent | 3ce18700f80a12c48a029b49c6201ad2410071bb (diff) | |
| download | haskell-ce9e2a1a9307bf43ead278dd1fc8db4325d82340.tar.gz | |
configure: Add --with-libdw-{includes,libraries} flags
Fixing #17255.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/ghc.mk | 6 | ||||
| -rw-r--r-- | rts/package.conf.in | 4 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 5bd830da6f..f25f2f9b75 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -543,6 +543,12 @@ rts_PACKAGE_CPP_OPTS += '-DFFI_LIB="C$(LIBFFI_NAME)"' endif +ifeq "$(UseLibdw)" "YES" +rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR=$(LibdwLibDir) +else +rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR= +endif + # ----------------------------------------------------------------------------- # dependencies diff --git a/rts/package.conf.in b/rts/package.conf.in index ce3146b4c5..93b664ae61 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -18,9 +18,9 @@ hidden-modules: import-dirs: #if defined(INSTALLING) -library-dirs: LIB_DIR"/rts" FFI_LIB_DIR +library-dirs: LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR #else /* !INSTALLING */ -library-dirs: TOP"/rts/dist/build" FFI_LIB_DIR +library-dirs: TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR #endif hs-libraries: "HSrts" FFI_LIB diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index 4b5d837c3a..b9a67c7ca1 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -115,6 +115,7 @@ library include-dirs: build ../includes includes includes/dist-derivedconstants/header @FFIIncludeDir@ + @LibdwIncludeDir@ includes: Stg.h install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h |