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

fix compiling ld64 with libc++

Browse Source
This commit is contained in:
Thomas Pöchtrager 2014-05-10 17:30:13 +02:00
parent c57030bc98
commit 523f4cd77c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -173,7 +173,7 @@ extract $CCTOOLS_TARBALL 1
pushd cctools*/cctools &>/dev/null pushd cctools*/cctools &>/dev/null
pushd .. &>/dev/null pushd .. &>/dev/null
if [ $LINKER_VERSION != "134.9" ]; then if [ $LINKER_VERSION != "134.9" ]; then
patch -p0 < $PATCH_DIR/cctools-f19cc13.patch patch -p0 < $PATCH_DIR/cctools-e3cbeaf.patch
fi fi
if [ "$PLATFORM" == "Linux" ]; then if [ "$PLATFORM" == "Linux" ]; then
patch -p0 < $PATCH_DIR/cctools-old-linux.patch patch -p0 < $PATCH_DIR/cctools-old-linux.patch

6
patches/cctools-f19cc13.patch → patches/cctools-e3cbeaf.patch
View File

@ -12,14 +12,16 @@ index 8b59f6b..3411e34 100644
LDFLAGS="$LDFLAGS -L/usr/local/lib `cat tmp/ldflags 2>/dev/null`" LDFLAGS="$LDFLAGS -L/usr/local/lib `cat tmp/ldflags 2>/dev/null`"
diff --git cctools/ld64/src/ld/code-sign-blobs/memutils.h cctools/ld64/src/ld/code-sign-blobs/memutils.h diff --git cctools/ld64/src/ld/code-sign-blobs/memutils.h cctools/ld64/src/ld/code-sign-blobs/memutils.h
index 8fa48d6..bcf1a23 100644 index 8fa48d6..4c97973 100644
--- cctools/ld64/src/ld/code-sign-blobs/memutils.h --- cctools/ld64/src/ld/code-sign-blobs/memutils.h
+++ cctools/ld64/src/ld/code-sign-blobs/memutils.h +++ cctools/ld64/src/ld/code-sign-blobs/memutils.h
@@ -33,6 +33,7 @@ @@ -33,6 +33,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
+#ifdef __GLIBCXX__
+using namespace __gnu_cxx; +using namespace __gnu_cxx;
+#endif
// //
// Encapsulate these very sharp tools in a separate (ugly-named) namespace // Encapsulate these very sharp tools in a separate (ugly-named) namespace