Port to iOS 5.0 SDK.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fb3037c724bc418ec391f855ca7bf06774d8da03..01a0f0eb7d8fd46170641b687d45e55874d18ea3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -186,7 +186,7 @@ Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions
 
 %.t.hpp: %.t.lo trampoline.sh
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions
 
 %.t.hpp: %.t.lo trampoline.sh

-       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir)
+       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir) -Xcompiler -nostdlib

 endif
 endif
 
 endif
 endif
 

diff --git a/ios.sh b/ios.sh
index 66d611f08502a6d37f7bee7c287d2e61a4e3b970..6f8257189db141ae86b1446f870511e20c783e95 100755 (executable)
--- a/ios.sh
+++ b/ios.sh
@@ -16,8 +16,8 @@ mkdir -p sysroot.ios/usr/include/ffi
 mv -v sysroot.ios/usr/include/{,ffi/}ffi.h
 
 plt=iPhoneOS
 mv -v sysroot.ios/usr/include/{,ffi/}ffi.h
 
 plt=iPhoneOS

-dev=/Developer/Platforms/$plt.platform/Developer
-sdk=${dev}/SDKs/$plt4.3.sdk
+dev=/Developer/Platforms/${plt}.platform/Developer
+sdk=${dev}/SDKs/${plt}5.0.sdk

 
 ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Headers sysroot.ios/usr/include/WebKit
 
 
 ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Headers sysroot.ios/usr/include/WebKit