aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authordavilla <davilla@4pi.com>2012-05-12 19:20:25 -0400
committerdavilla <davilla@4pi.com>2012-05-12 19:20:25 -0400
commit9a27da9902a082fdd6315533889dd236d3e97fdf (patch)
tree27b98727713d8f071b0be685946f7bdcfa92352b /tools
parent8b5ef797b378c8cf83841f842aaf8099b81b23e3 (diff)
[ios] fixed, ios depends build on xcode4/10.7
Diffstat (limited to 'tools')
-rw-r--r--tools/darwin/depends/config.site_ios.mk.in1
-rw-r--r--tools/darwin/depends/samba/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in
index dca9adc9ce..81291256ba 100644
--- a/tools/darwin/depends/config.site_ios.mk.in
+++ b/tools/darwin/depends/config.site_ios.mk.in
@@ -18,6 +18,7 @@ host_alias=arm-apple-darwin10
cross_compiling=yes
platform_path=@use_xcodepath@/Platforms/iPhoneOS.platform/Developer
+platform_xcode_path=@use_xcodepath@
platform_os_cflags=-arch @use_arch@ -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2
platform_os_ldflags=-arch @use_arch@ -mcpu=cortex-a8
platform_sdk_path=@use_sdk_path@
diff --git a/tools/darwin/depends/samba/Makefile b/tools/darwin/depends/samba/Makefile
index 67cd3cc5a3..f8eab31d5a 100644
--- a/tools/darwin/depends/samba/Makefile
+++ b/tools/darwin/depends/samba/Makefile
@@ -1,4 +1,5 @@
include ../Makefile.include
+include ../config.site.mk
# lib name, version
LIBNAME=samba
@@ -26,7 +27,7 @@ $(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(SOURCE)/source3; ./autogen.sh
cd $(SOURCE)/source3; $(CONFIGURE)
if test "$(DARWIN)" = "ios"; then \
- cp -f /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(SDK).sdk/usr/include/crt_externs.h $(PREFIX)/include/; \
+ cp -f $(platform_xcode_path)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(SDK).sdk/usr/include/crt_externs.h $(PREFIX)/include/; \
fi
cd $(SOURCE)/source3; make -j 1 bin/libsmbclient.dylib