Clean up compiler and linker constructors

[builder.git] / source / androidcompiler.cpp

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 01daa2a65c6ea2318bcf0a6f79366945e2309575..e45715e5a7313068ff66663406473f1e52608565 100644 (file)
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -13,7 +13,7 @@ using namespace std;
 using namespace Msp;
 
 AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string &t, const AndroidNdk &n):
-       GnuCompiler(b, a, t, n.get_platform_sysroot()),
+       GnuCompiler(b, a, t),
        ndk(n)
 {
        if(ndk.get_root_dir().empty())
@@ -25,8 +25,9 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
 
        if(ndk.get_platform_sysroot().empty())
                problems.push_back("Android platform not found");
+       else
+               build_info.sysroot = ndk.get_platform_sysroot();
 
-       build_info.incpath.insert(build_info.incpath.end(), system_path.begin(), system_path.end());
        if(tag=="CXX")
                build_info.libs.push_back("gnustl_static");
 }