summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-11-11 18:49:09 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-11-19 11:56:21 -0500
commit2b27cc164ae5a978a8abd9966d04af74628a5396 (patch)
treef3d65422664b92428897ce2331b6097a10959fa8 /rts
parentcd40e12ad8072c6b881c6bb650e39e4d29c9718c (diff)
downloadhaskell-2b27cc164ae5a978a8abd9966d04af74628a5396.tar.gz
Properly account for libdw paths in make build system
Should finally fix #17255.
Diffstat (limited to 'rts')
-rw-r--r--rts/ghc.mk2
-rw-r--r--rts/package.conf.in7
2 files changed, 8 insertions, 1 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk
index f25f2f9b75..dfff8df796 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -544,8 +544,10 @@ rts_PACKAGE_CPP_OPTS += '-DFFI_LIB="C$(LIBFFI_NAME)"'
endif
ifeq "$(UseLibdw)" "YES"
+rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR=$(LibdwIncludeDir)
rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR=$(LibdwLibDir)
else
+rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR=
rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR=
endif
diff --git a/rts/package.conf.in b/rts/package.conf.in
index 93b664ae61..e4cb159cb8 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -67,7 +67,12 @@ extra-libraries:
#if defined(INSTALLING)
include-dirs: INCLUDE_DIR FFI_INCLUDE_DIR
#else /* !INSTALLING */
-include-dirs: TOP"/rts/dist/build" TOP"/includes" TOP"/includes/dist-derivedconstants/header" FFI_INCLUDE_DIR TOP"/includes/dist-install/build"
+include-dirs: TOP"/rts/dist/build"
+ TOP"/includes"
+ TOP"/includes/dist-derivedconstants/header"
+ FFI_INCLUDE_DIR
+ LIBDW_INCLUDE_DIR
+ TOP"/includes/dist-install/build"
#endif
includes: Stg.h