diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-26 00:24:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-26 00:24:47 +0000 |
| commit | e24ca048efad3c1e4d6e8af7b37576600e0c29c6 (patch) | |
| tree | 211f20476f11ca5a73374494b7c4687125a64fb3 | |
| parent | 2f807b2d2125c716de2c25da3ae5db5e8ed892b5 (diff) | |
| parent | 159854c27e31ac06b99e711167d0ad7aa07008bd (diff) | |
| download | ndk-e24ca048efad3c1e4d6e8af7b37576600e0c29c6.tar.gz | |
Merge "Fix the libc++ test runner for the old layout."
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py | 13 | ||||
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py b/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py index 701f478f3..7f587130f 100644 --- a/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py +++ b/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py @@ -58,16 +58,13 @@ class Configuration(libcxx.test.config.Configuration): # Configure libc++ library paths. self.cxx.link_flags.append('-L' + self.cxx_library_root) - triple = self.get_lit_conf('target_triple') - binutils_dir = os.path.join( - self.get_lit_conf('binutils_path'), triple, 'bin') - self.cxx.link_flags.append('-B' + binutils_dir) - - gcclibs_dir = os.path.join( - os.environ['NDK'], 'gcclibs', triple) - self.cxx.link_flags.append('-L' + gcclibs_dir) + gcc_toolchain = self.get_lit_conf('gcc_toolchain') + self.cxx.link_flags.append('-gcc-toolchain') + self.cxx.link_flags.append(gcc_toolchain) self.cxx.link_flags.append('-lgcc') + + triple = self.get_lit_conf('target_triple') if triple.startswith('arm-'): self.cxx.link_flags.append('-latomic') diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in index 9c191181c..6dd253c3c 100644 --- a/sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in +++ b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in @@ -15,7 +15,7 @@ libcxx_dir = os.path.join(ndk, 'sources/cxx-stl/llvm-libc++') libcxx_src_dir = os.path.join(libcxx_dir, 'libcxx') config.cxx_under_test = os.path.join( - ndk, "toolchains/llvm/bin/clang++") + ndk, "toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") config.std = "c++11" config.libcxx_src_root = libcxx_src_dir config.libcxx_obj_root = libcxx_src_dir @@ -31,7 +31,8 @@ config.use_sanitizer = "" config.configuration_variant = "libcxx.ndk" config.target_triple = "%TRIPLE%" config.sysroot = os.path.join(ndk, "platforms/android-21/arch-%ARCH%/") -config.binutils_path = os.path.join(ndk, "binutils/%TRIPLE%") +config.gcc_toolchain = os.path.join( + ndk, "toolchains/%TRIPLE%-4.9/prebuilt/linux-x86_64") # Let the main config do the real work. lit_config.load_config( |