Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-08 02:55:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

cctools: don't overwrite LD_LIBRARY_PATH

Browse Source
This commit is contained in:
Thomas Pöchtrager 2014-07-05 11:27:07 +02:00
parent dce760ab01
commit 6c06a15b42
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -184,6 +184,8 @@ fi
if [ "$PLATFORM" == "Linux" ]; then
patch -p0 < $PATCH_DIR/cctools-old-linux.patch
fi
# fix LD_LIBRARY_PATH
patch -p0 < $PATCH_DIR/cctools-f7a5930.patch
popd &>/dev/null
patch -p0 < $PATCH_DIR/cctools-ld64-1.patch
patch -p0 < $PATCH_DIR/cctools-ld64-2.patch

34
patches/cctools-f7a5930.patch Normal file
View File

@ -0,0 +1,34 @@
commit f7a5930c3f0931340516587241a841b1c6b31c86
Author: Thomas Pöchtrager <t.poechtrager@gmail.com>
Date: Sat Jul 5 11:07:48 2014 +0200
fix LD_LIBRARY_PATH
diff --git cctools/configure.ac cctools/configure.ac
index 4ac2d69..c4f6c47 100644
--- cctools/configure.ac
+++ cctools/configure.ac
@@ -6,9 +6,10 @@ AC_CANONICAL_TARGET
AC_ARG_PROGRAM
-#force compiler to clang
+# force compiler to clang
CC=clang
CXX=clang++
+CPP="clang -E"
CFLAGS="$CFLAGS `cat tmp/cflags 2>/dev/null`"
CFLAGS="$CFLAGS -isystem /usr/local/include -isystem /usr/pkg/include -O3"
@@ -16,9 +17,9 @@ CXXFLAGS="$CXXFLAGS -std=c++0x `cat tmp/cxxflags 2>/dev/null`"
CXXFLAGS="$CXXFLAGS -isystem /usr/local/include -isystem /usr/pkg/include -O3"
LDFLAGS="$LDFLAGS -L/usr/local/lib `cat tmp/ldflags 2>/dev/null`"
-export LD_LIBRARY_PATH="`cat tmp/ldpath 2>/dev/null`"
-CPP="clang -E"
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`cat tmp/ldpath 2>/dev/null`"
+export LD_LIBRARY_PATH
# FIXME 'subdir-objects' breaks dependency tracking
AM_INIT_AUTOMAKE([1.10 no-define no-dist-gzip dist-bzip2 tar-ustar subdir-objects no-dependencies])