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.
This commit is contained in:
Andrew Larssen
2014-01-17 12:04:31 +00:00
committed by Watson
parent 875f0ff170
commit aa9cdf5c98

View File

@@ -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