diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-10-15 18:13:17 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-10-15 18:13:17 +0400 |
| commit | ed1b716b650dbe5f574d691e3f576a33224e0a8e (patch) | |
| tree | c1a76252267d2de008f4db32c154949b53702aa9 /configure | |
| parent | d1d783ed3138fd9d1f83fbb64ce2a4c4865e4079 (diff) | |
| parent | 2b5f31505fa2d3a6dfd2ce958abd1d31705c4c3d (diff) | |
Merge remote-tracking branch 'mono/master' into xs6
Conflicts:
configure
main/build/MacOSX/monostub.m
main/src/addins/MacPlatform/MacPlatform.cs
version-checks
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -278,7 +278,7 @@ if test `uname` = "Darwin"; then 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:`pwd`/main/build/bin" + export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:/Library/Developer/CommandLineTools/usr/lib:/usr/local/lib:`pwd`/main/build/bin" fi configure_packages |