diff --git a/build.sh b/build.sh index 71bbc09..bcdef19 100755 --- a/build.sh +++ b/build.sh @@ -173,7 +173,7 @@ extract $CCTOOLS_TARBALL 1 pushd cctools*/cctools &>/dev/null pushd .. &>/dev/null if [ $LINKER_VERSION != "134.9" ]; then - patch -p0 < $PATCH_DIR/cctools-f19cc13.patch + patch -p0 < $PATCH_DIR/cctools-e3cbeaf.patch fi if [ "$PLATFORM" == "Linux" ]; then patch -p0 < $PATCH_DIR/cctools-old-linux.patch diff --git a/patches/cctools-f19cc13.patch b/patches/cctools-e3cbeaf.patch similarity index 92% rename from patches/cctools-f19cc13.patch rename to patches/cctools-e3cbeaf.patch index 9c7f6c7..c3ad9c2 100644 --- a/patches/cctools-f19cc13.patch +++ b/patches/cctools-e3cbeaf.patch @@ -12,14 +12,16 @@ index 8b59f6b..3411e34 100644 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 -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 -@@ -33,6 +33,7 @@ +@@ -33,6 +33,9 @@ #include #include ++#ifdef __GLIBCXX__ +using namespace __gnu_cxx; ++#endif // // Encapsulate these very sharp tools in a separate (ugly-named) namespace