summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2011-12-13 10:20:51 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2011-12-13 10:20:51 +0000
commitefc3312befa5b664a5ff3789f30a68b631b10ac7 (patch)
tree5c38746e9f0ab5e94f0878627dbc38dc0c147a07
parent5b718b5db4f848e68761adad23c4919b5076fa0a (diff)
downloadzlib-efc3312befa5b664a5ff3789f30a68b631b10ac7.tar.gz
Morph will only run ldconfig if it is bootstrapping
It may be cleaner to use a different branch for bootstrap and non-bootstrap builds, but this needs morphs which require this one to be altered as well. Patches would have to be applied to both branches as well, it may be less maintanence to make the morph look a little ugly. Also there is precedent in the eglibc morph.
-rw-r--r--zlib.morph2
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib.morph b/zlib.morph
index ac1163f..98267b9 100644
--- a/zlib.morph
+++ b/zlib.morph
@@ -10,6 +10,6 @@
],
"install-commands": [
"LD_LIBRARY_PATH=\"/tools/lib:$LD_LIBRARY_PATH\" PATH=\"/tools/bin:$PATH\" make install-libs",
- "ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache"
+ "if $BOOTSTRAP; then ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache; fi"
]
}