From cbaa387542539608439c67e79ec17458eca8ec79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 13 Nov 2013 22:59:39 +0100 Subject: [PATCH] small cleanup --- README.md | 4 ++-- build.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7571a1d..17d16bf 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The goal of OSXCross is to deliver you a high quality cross toolchain targeting ### HOW DOES IT WORK? ### -[Clang/LLVM is a cross compiler by default](http://clang.llvm.org/docs/CrossCompilation.html) and is now available on nearly every Linux distrubtion. +[Clang/LLVM is a cross compiler by default](http://clang.llvm.org/docs/CrossCompilation.html) and is now available on nearly every Linux distribution. Therefore we "just" need a proper [port](https://code.google.com/p/ios-toolchain-based-on-clang-for-linux/source/browse/#svn%2Ftrunk%2Fcctools-porting%2Fpatches) of the [cctools](http://www.opensource.apple.com/tarballs/cctools) (ld, lipo, ...) for Linux, and the OS X SDK. @@ -71,7 +71,7 @@ on debian like systems you can run `apt-get build-dep gcc` to install them. XX= the target version, you can find it out by running `osxcross-conf` and then see `TARGET`. -You can use the shorting `o32-...` or `i386-apple-darwin...` what ever you like more. +You can use the shortcut `o32-...` or `i386-apple-darwin...` what ever you like more. *I'll continue from now on with `o32-clang`, but remember you can simply replace it with `o32-gcc` or `i386-apple-darwin...`.* diff --git a/build.sh b/build.sh index 36f619d..4d9a9f5 100755 --- a/build.sh +++ b/build.sh @@ -108,11 +108,13 @@ patch -p0 < $PATCH_DIR/cctools-ld64-2.patch patch -p0 < $PATCH_DIR/cctools-ld64-3.patch patch -p0 < $PATCH_DIR/cctools-llvm-3.4.patch patch -p0 < $PATCH_DIR/cctools-conf-1.patch +set +e grep -n "__block," /usr/include/unistd.h &>/dev/null if [ $? -eq 0 ]; then echo "applying workaround for buggy unistd.h" $PATCH_DIR/fix-unistd-issue.sh fi +set -e ./autogen.sh ./configure --prefix=$TARGET_DIR --target=x86_64-apple-$TARGET make -j$JOBS