diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-06-20 23:30:20 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-06-20 23:30:45 +0400 |
| commit | 2e4006cf3fdd630c9f4817e1bf706b53dab7104a (patch) | |
| tree | f9d688dc779fc9816091af610d2924742ac71761 /configure | |
| parent | d91e0281ca86443b3b146a4fc564126fd82c5e08 (diff) | |
[configure] Always append CommandLineTools to DYLD_FALLBACK_LIBRARY_PATH
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -271,11 +271,14 @@ if [ x$select == xyes -o ! -a profiles/$profile ]; then fi if test `uname` = "Darwin"; then + # if building on bots or in default environment, fix up paths to use system Mono if test "x$BUILD_REVISION" != "x" -o "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then - export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib" + export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib" export PATH="/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH" export ACLOCAL_FLAGS="-I /Library/Frameworks/Mono.framework/Versions/Current/share/aclocal" fi + # add in libsvn's directory as a fallback path. user-set paths will override it + export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:/Library/Developer/CommandLineTools/usr/lib" fi configure_packages |