diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-17 14:43:59 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-11-17 15:43:47 -0800 |
| commit | f789e704d7199b8cb2937e0579f42891933fc614 (patch) | |
| tree | bdcf396065672f65c3d765d16e428f418e2901ec /sources | |
| parent | a3aaa618ba5f675fdff94a19503f4401d9310d7d (diff) | |
| download | ndk-f789e704d7199b8cb2937e0579f42891933fc614.tar.gz | |
Remove the $HOST_TAG from binutils and toolchains.
Turns out this complicates a lot of code unnecessarily because we need
to always check if we're a 32- or 64-bit NDK on Windows.
Bug: http://b/25454836
Change-Id: I50c53aee76fbc88f0be8c95d7ae6e7d550ca468e
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/cxx-stl/llvm-libc++/libcxx/ndk-test.sh | 2 | ||||
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/libcxx/test/lit.ndk.cfg.in | 4 | ||||
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/ndk-test.sh b/sources/cxx-stl/llvm-libc++/libcxx/ndk-test.sh index 0ca71b505..4a6603f23 100755 --- a/sources/cxx-stl/llvm-libc++/libcxx/ndk-test.sh +++ b/sources/cxx-stl/llvm-libc++/libcxx/ndk-test.sh @@ -48,7 +48,7 @@ LIT_ARGS=${@:2} LIBCXX_DIR=$NDK/sources/cxx-stl/llvm-libc++/libcxx sed -e "s:%ABI%:$ABI:g" -e "s:%TRIPLE%:$TRIPLE:g" \ - -e "s:%HOST_TAG%:$HOST_TAG:g" -e "s:%ARCH%:$ARCH:g" \ + -e "s:%ARCH%:$ARCH:g" \ $LIBCXX_DIR/test/lit.ndk.cfg.in > $LIBCXX_DIR/test/lit.site.cfg adb push $LIBCXX_DIR/../libs/$ABI/libc++_shared.so /data/local/tmp 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 237ee83fe..b41eb9b99 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/%HOST_TAG%/llvm-3.6/prebuilt/bin/clang++") + ndk, "toolchains/llvm-3.6/prebuilt/bin/clang++") config.std = "c++11" config.libcxx_src_root = libcxx_src_dir config.libcxx_obj_root = libcxx_src_dir @@ -31,7 +31,7 @@ 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/%HOST_TAG%/%TRIPLE%") +config.binutils_path = os.path.join(ndk, "binutils/%TRIPLE%") # Let the main config do the real work. lit_config.load_config( diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg index 7d6e99b74..0fdc5f6c8 100644 --- a/sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg +++ b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg @@ -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/linux-x86_64/llvm-3.6/prebuilt/bin/clang++") + ndk, "toolchains/llvm-3.6/prebuilt/bin/clang++") config.std = "c++11" config.libcxx_src_root = libcxx_src_dir config.libcxx_obj_root = libcxx_src_dir @@ -32,7 +32,7 @@ config.configuration_variant = "libcxx.ndk" config.target_triple = "aarch64-linux-android" config.sysroot = os.path.join(ndk, "platforms/android-21/arch-arm64/") config.gcc_toolchain = os.path.join( - ndk, "toolchains/linux-x86_64/aarch64-linux-android-4.9") + ndk, "toolchains/aarch64-linux-android-4.9") # Let the main config do the real work. lit_config.load_config( |