From aa9cdf5c982c1567e47ee04502045d2e255384e8 Mon Sep 17 00:00:00 2001 From: Andrew Larssen Date: Fri, 17 Jan 2014 12:04:31 +0000 Subject: [PATCH] Fix hard coded path that does not honour xcode-select in builder. This is causing problems building amd64 iOS 7.1 using Xcode5.1-Beta3 as it is not in the usual path. --- lib/motion/project/builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb index 10bf43d3..456cb28d 100644 --- a/lib/motion/project/builder.rb +++ b/lib/motion/project/builder.rb @@ -143,7 +143,8 @@ module Motion; module Project; sh "#{cc} -c #{src_path} -o #{obj_path} -arch arm64 -miphoneos-version-min=7.0" obj_path end - sh "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld \"#{asm}\" \"#{@dummy_object_file}\" -arch arm64 -r -o \"#{arch_obj}\"" + ld_path = File.join(App.config.xcode_dir, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld') + sh "#{ld_path} \"#{asm}\" \"#{@dummy_object_file}\" -arch arm64 -r -o \"#{arch_obj}\"" else sh "#{cc} -fexceptions -c -arch #{arch} \"#{asm}\" -o \"#{arch_obj}\"" end