diff --git a/.gitignore b/.gitignore index 58194a7..af0a40b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.o *gcc*.tar.* *MacOSX*.* cpucount diff --git a/CHANGELOG b/CHANGELOG index 7183554..1094299 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +/****************************** v0.14 ********************************/ + +changed: + * updated cctools to 886 + * updated ld64 to 264.3.102 + /****************************** v0.13 ********************************/ changed: diff --git a/build.sh b/build.sh index 1283680..af98afb 100755 --- a/build.sh +++ b/build.sh @@ -74,7 +74,7 @@ if [ -z "$OSX_VERSION_MIN" ]; then fi fi -OSXCROSS_VERSION=0.13 +OSXCROSS_VERSION=0.14 X86_64H_SUPPORTED=0 @@ -130,8 +130,8 @@ function remove_locks() source $BASE_DIR/tools/trap_exit.sh # CCTOOLS -LINKER_VERSION=253.9 -CCTOOLS="cctools-877.8-ld64-$LINKER_VERSION" +LINKER_VERSION=264.3.102 +CCTOOLS="cctools-886-ld64-$LINKER_VERSION" CCTOOLS_TARBALL=$(ls $TARBALL_DIR/$CCTOOLS*.tar.* | head -n1) CCTOOLS_REVHASH=$(echo $(basename "$CCTOOLS_TARBALL") | tr '_' '\n' | \ tr '.' '\n' | tail -n3 | head -n1) @@ -149,7 +149,6 @@ pushd .. &>/dev/null popd &>/dev/null patch -p0 < $PATCH_DIR/cctools-ld64-1.patch patch -p0 < $PATCH_DIR/cctools-ld64-2.patch -patch -p0 < $PATCH_DIR/cctools-ld64-3.patch echo "" CONFFLAGS="--prefix=$TARGET_DIR --target=x86_64-apple-$TARGET " CONFFLAGS+="--disable-clang-as " diff --git a/patches/cctools-ld64-3.patch b/patches/cctools-ld64-3.patch deleted file mode 100644 index f41d826..0000000 --- a/patches/cctools-ld64-3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libtool.c -+++ misc/libtool.c -@@ -1526,7 +1526,7 @@ void) - for(k = 0; k < archs[j].nmembers; k++){ - if(archs[j].members[k].mh == NULL && - #ifdef LTO_SUPPORT -- archs[j].members[k].lto_contents == TRUE && -+ archs[j].members[k].lto_contents == FALSE && - #endif /* LTO_SUPPORT */ - archs[j].members[k].mh64 == NULL){ - error("library member: %s(%.*s) is not an " diff --git a/tarballs/cctools-877.8-ld64-253.9_e2c9d34.tar.xz b/tarballs/cctools-877.8-ld64-253.9_e2c9d34.tar.xz deleted file mode 100644 index 6fce4dd..0000000 Binary files a/tarballs/cctools-877.8-ld64-253.9_e2c9d34.tar.xz and /dev/null differ diff --git a/tarballs/cctools-886-ld64-264.3.102_db1f8d9.tar.xz b/tarballs/cctools-886-ld64-264.3.102_db1f8d9.tar.xz new file mode 100644 index 0000000..058ce9c Binary files /dev/null and b/tarballs/cctools-886-ld64-264.3.102_db1f8d9.tar.xz differ