In trampoline, make $strlcpy not crash given NULL.

[cycript.git] / xcode.sh

diff --git a/xcode.sh b/xcode.sh
index c04d8a7366a50d626240690411e7b682ab8a1ac9..45b2ea94e5fc9fa347ccbb70e703c0815a399de3 100755 (executable)
--- a/xcode.sh
+++ b/xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 # Cycript - Optimizing JavaScript Compiler/Runtime
 # Copyright (C) 2009-2013  Jay Freeman (saurik)
 
 # Cycript - Optimizing JavaScript Compiler/Runtime
 # Copyright (C) 2009-2013  Jay Freeman (saurik)


@@ -59,12 +59,16 @@ function configure() {
     rm -rf build."${dir}"
     mkdir build."${dir}"
     cd build."${dir}"
     rm -rf build."${dir}"
     mkdir build."${dir}"
     cd build."${dir}"

-    CPP="${cc} -E" CC="${cc} ${flg}" CXXCPP="${cxx} -E" CXX="${cxx} ${flg}" OBJCXX="${cxx} ${flg}" ../configure "${flags[@]}" --prefix="/usr" "$@"
+
+    CC="${cc} ${flg}" CXX="${cxx} ${flg}" OBJCXX="${cxx} ${flg}" \
+        ../configure --enable-maintainer-mode "${flags[@]}" --prefix="/usr" "$@"
+

     cd ..
 }
 
 for arch in i386 x86_64; do
     cd ..
 }
 
 for arch in i386 x86_64; do

-    configure "mac-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" CPPFLAGS="-I../readline" LDFLAGS="-L../readline"
+    configure "mac-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" \
+        CPPFLAGS="-I../readline" LDFLAGS="-L../readline"

 done
 
 function build() {
 done
 
 function build() {


@@ -76,18 +80,37 @@ function build() {
     configure "${dir}" "${sdk}" "${flg}" "$@" --enable-static --with-pic
 }
 
     configure "${dir}" "${sdk}" "${flg}" "$@" --enable-static --with-pic
 }
 

-for arch in i386; do
-    build "sim-${arch}" iphonesimulator "-arch ${arch} -mios-simulator-version-min=2.0" OBJCXXFLAGS="-fobjc-abi-version=2 -fobjc-legacy-dispatch" CPPFLAGS="-I../libffi.${arch}/include" LDFLAGS="-L.." --disable-console
+for arch in i386 x86_64; do
+    build "sim-${arch}" iphonesimulator "-arch ${arch} -mios-simulator-version-min=4.0" \
+        OBJCXXFLAGS="-fobjc-abi-version=2 -fobjc-legacy-dispatch" \
+        CPPFLAGS="-I../libffi.${arch}/include" \
+        LDFLAGS="-L.." \
+    --disable-console

 done
 
 done
 

-for arch in armv6 armv7 armv7s; do
-    if [[ ${arch} == armv6 ]]; then
-        sdk=iphoneos5.1
-        flg=()
+for arch in armv6 armv7 armv7s arm64; do
+    cpf="-I../libffi.${arch}/include"
+    ldf="-L.."
+
+    flg=()
+    if [[ ${arch} != armv6 ]]; then
+        flg+=(--disable-console)
+    else
+        flg+=(LTLIBAPR="../sysroot.ios/usr/lib/libapr-1.dylib")
+        flg+=(LTLIBGCC="-lgcc_s.1")
+        cpf+=" -include ${PWD}/xcode.h"
+        cpf+=" -mllvm -arm-reserve-r9"
+        cpf+=" -I../sysroot.ios/usr/include -I../sysroot.ios/usr/include/apr-1"
+        ldf+=" -L../sysroot.ios/usr/lib"
+    fi
+
+    if [[ ${arch} == arm64 ]]; then
+        min=7.0

     else
     else

-        sdk=iphoneos
-        flg=(--disable-console)
+        min=2.0
+        #cpf+=" -mthumb"

     fi
 
     fi
 

-    build "ios-${arch}" "${sdk}" "-arch ${arch} -miphoneos-version-min=2.0" --host=arm-apple-darwin10 CPPFLAGS="-I../libffi.${arch}/include -I../sysroot.ios/usr/include -I../sysroot.ios/usr/include/apr-1" LTLIBAPR="../sysroot.ios/usr/lib/libapr-1.dylib" LDFLAGS="-L.. -L../sysroot.ios/usr/lib" "${flg[@]}"
+    build "ios-${arch}" iphoneos "-arch ${arch} -miphoneos-version-min=${min}" --host=arm-apple-darwin10 \
+        CPPFLAGS="${cpf}" LDFLAGS="${ldf}" "${flg[@]}" --host=arm-apple-darwin10

 done
 done