[Libreoffice-commits] .: 2 commits - README.cross solenv/gbuild

[Tor Lillqvist]

 README.cross                  |   14 +++++++++++++-
 solenv/gbuild/platform/ios.mk |   28 ++++++++++------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

New commits:
commit ea6e60ee5973b1e1ab4948d23ab748cebcc34aee
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 1 00:45:46 2011 +0300

    Require proper CC and CXX environment variables, don't hardcode SDK path
    
    Makes building for the iOS Simulator go a bit better. (But still
    breaks.)

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 1c52e48..ab0b18f 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -31,21 +31,19 @@ COM := GCC
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP := /usr/bin/mktemp -t gbuild.
 
-gb_CC := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_CXX := "g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_GCCP := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
+ifeq ($(CC),)
+$(error You must set CC in the environment. See README.cross for example.)
+endif
+ifeq ($(CXX),)
+$(error You must set CXX in the environment. See README.cross for example.)
+endif
 
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
 gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
-endif
+gb_GCCP := $(CC)
+gb_AR := ar
+gb_AWK := awk
+gb_CLASSPATHSEP := :
 
 gb_OSDEFS := \
 	-D$(OS) \
@@ -63,11 +61,7 @@ gb_COMPILERDEFS := \
 
 gb_CPUDEFS := -DARM32
 
-gb_SDKDIR := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-
-
 gb_CFLAGS := \
-	-isysroot $(gb_SDKDIR) \
 	-Wall \
 	-Wendif-labels \
 	-Wextra \
@@ -78,7 +72,6 @@ gb_CFLAGS := \
 	-pipe \
 
 gb_CXXFLAGS := \
-	-isysroot $(gb_SDKDIR) \
 	-Wall \
 	-Wendif-labels \
 	-Wextra \
@@ -115,7 +108,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS := \
-	-Wl,-syslibroot,$(gb_SDKDIR) \
 	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
commit b5514cb1c8714891374ea3e477ad0d7f4e1ccaf3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 1 00:45:03 2011 +0300

    Add example autogen.lastrun for building for the iOS Simulator

diff --git a/README.cross b/README.cross
index 57cf592..291eaf6 100644
--- a/README.cross
+++ b/README.cross
@@ -169,7 +169,7 @@ thought yet.
 The Apple tool-chain for iOS cross-building is available only for
 MacOSX, so that is where I have been doing it.
 
-Here is my autogen.lastrun for iOS:
+Here is my autogen.lastrun for iOS (device):
 CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
 CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
@@ -179,6 +179,18 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
 --with-num-cpus=1
 --with-max-jobs=1
 
+And here for the iOS simulator:
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--with-distro=LibreOfficeiOS
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+--disable-librsvg
+--enable-debug
+
 
 Android
 -------