summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-11-27 12:47:40 (GMT)
committerSwift Review <review@swift.im>2014-12-10 14:57:23 (GMT)
commitea0838a3a7bd33ee49a8bec1dc4b111e8cd720db (patch)
treebc31f2a238981b3425640f22d79f11fba2220f5a /BuildTools/SCons
parent8edff5891388643382151e80d170e87902eff2ed (diff)
downloadswift-ea0838a3a7bd33ee49a8bec1dc4b111e8cd720db.zip
swift-ea0838a3a7bd33ee49a8bec1dc4b111e8cd720db.tar.bz2
Use ar tool from the cross-compiling toolchain when building for Android.
Test-Information: Tested with nm tool from cross-compiling toolchain. Before it would report 'Malformed archive' for libSwiften.a. Now it correctly lists all symbols without reporting an error. Change-Id: I3901bb206487a05124986bbdc53f336aed932f5b
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot1
1 files changed, 1 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 00242fe..1455962 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -420,6 +420,7 @@ if target in ["android"] :
env["ENV"]["PATH"] = env["android_toolchain"] + "/bin:" + env["ENV"]["PATH"]
env["CC"] = "arm-linux-androideabi-gcc"
env["CXX"] = "arm-linux-androideabi-g++"
+ env["AR"] = "arm-linux-androideabi-ar"
env["RANLIB"] = "arm-linux-androideabi-ranlib"
env.Append(CPPDEFINES = ["ANDROID"])
env.Append(CPPDEFINES = ["_REENTRANT", "_GLIBCXX__PTHREADS"])