diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-09-27 14:53:09 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-09-27 14:53:09 +0000 |
| commit | 68617fca55bbc38004dfed3af27eed47b9cb3ab0 (patch) | |
| tree | 890bd1f44725fc6f1ef06edde6bf9e98d516fa83 /rules/manual-package-config.mk | |
| parent | bbc0c3554ff43f310e64c4b0a75c6a1f364f645f (diff) | |
| download | haskell-68617fca55bbc38004dfed3af27eed47b9cb3ab0.tar.gz | |
Use $topdir in the RTS's package.conf file when doing a relocatable build
Diffstat (limited to 'rules/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 5a24141d99..9fc87ec584 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -29,8 +29,8 @@ $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE) $1/package.conf.install: $$(CPP) $$(RAWCPP_FLAGS) -P \ -DINSTALLING \ - -DLIB_DIR='"$$(ghclibdir)"' \ - -DINCLUDE_DIR='"$$(ghclibdir)/include"' \ + -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \ + -DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \ $$($1_PACKAGE_CPP_OPTS) \ -x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in | \ grep -v '^#pragma GCC' | \ |