diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-01 00:45:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-01 00:47:41 +0300 |
| commit | aefd493df236a191785373fc9e58a4c7f7c9259d (patch) | |
| tree | b113e540cc6a6b6e4d9086f49971d52365f839a8 | |
| parent | Add example autogen.lastrun for building for the iOS Simulator (diff) | |
| download | core-aefd493df236a191785373fc9e58a4c7f7c9259d.tar.gz core-aefd493df236a191785373fc9e58a4c7f7c9259d.zip | |
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.)
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 1c52e488f674..ab0b18fbb187 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 \ |