projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
bbc0c35
)
Use $topdir in the RTS's package.conf file when doing a relocatable build
author
Ian Lynagh
<igloo@earth.li>
Sun, 27 Sep 2009 14:53:09 +0000
(14:53 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 27 Sep 2009 14:53:09 +0000
(14:53 +0000)
rules/manual-package-config.mk
patch
|
blob
|
history
diff --git
a/rules/manual-package-config.mk
b/rules/manual-package-config.mk
index
5a24141
..
9fc87ec
100644
(file)
--- 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' | \