if(ndk.get_platform_sysroot().empty())
problems.push_back("Android platform not found");
+ else if(!ndk.get_common_sysroot().empty())
+ {
+ build_info.sysroot = ndk.get_common_sysroot();
+ /* The common sysroot has asm headers in arch directories and the
+ compiler doesn't pick them up automatically */
+ build_info.incpath.push_back(ndk.get_common_sysroot()/"usr/include"/architecture->get_cross_prefix());
+ }
else
build_info.sysroot = ndk.get_platform_sysroot();
void AndroidCompiler::do_prepare()
{
GnuCompiler::do_prepare();
- if(executable && tag=="CXX")
+ if(tag=="CXX")
{
- ExternalTask::Arguments argv;
- argv.push_back(executable->get_path().str());
- argv.push_back("-dumpversion");
-
- builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
- string version;
- try
- {
- version = strip(ExternalTask::run_and_capture_output(argv));
- builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
- }
- catch(const runtime_error &)
- { }
-
+ string version_str = format("%d.%d.%d", version>>16, (version>>8)&0xFF, version&0xFF);
FS::Path libstdcxx_dir = ndk.get_root_dir()/"sources"/"cxx-stl"/"gnu-libstdc++";
FS::Path libstdcxx_path;
while(1)
{
- libstdcxx_path = libstdcxx_dir/version;
+ libstdcxx_path = libstdcxx_dir/version_str;
if(FS::exists(libstdcxx_path))
break;
- string::size_type dot = version.rfind('.');
+ string::size_type dot = version_str.rfind('.');
if(dot==string::npos)
{
problems.push_back("C++ standard library not found");
return;
}
- version = version.substr(0, dot);
+ version_str = version_str.substr(0, dot);
}
FS::Path public_dir = libstdcxx_path/"include";