diff options
| author | Dan Albert <danalbert@google.com> | 2018-11-27 13:00:14 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-11-27 13:00:14 -0800 |
| commit | dc2cc5f94756878c2ae214f47988bed1302aef5b (patch) | |
| tree | 6adce8dd0b9e172feadf5866cc5b71f58bbdaa60 /build/tools | |
| parent | 921a40079b113dac703769cd681abc663fd60e8e (diff) | |
| download | ndk-dc2cc5f94756878c2ae214f47988bed1302aef5b.tar.gz | |
Only use -stdlib=libc++ with clang++.
Test: Manual inspection of build flags with `clang -v`
Bug: https://github.com/android-ndk/ndk/issues/849
Change-Id: Ibdb2254ee9e91f94c59c8c9c794b19ae617ef6d2
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/make_standalone_toolchain.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py index 3978d6b1d..29ea2b726 100755 --- a/build/tools/make_standalone_toolchain.py +++ b/build/tools/make_standalone_toolchain.py @@ -121,7 +121,7 @@ def make_clang_scripts(install_dir, triple, api, windows): arch = 'armv7a' # Target armv7, not armv5. target = '-'.join([arch, 'none', os_name, env]) - flags = '-target {}{} -stdlib=libc++'.format(target, api) + flags = '-target {}{}'.format(target, api) # We only need mstackrealign to fix issues on 32-bit x86 pre-24. After 24, # this consumes an extra register unnecessarily, which can cause issues for @@ -150,7 +150,7 @@ def make_clang_scripts(install_dir, triple, api, windows): clangpp.write(textwrap.dedent("""\ #!/bin/bash if [ "$1" != "-cc1" ]; then - `dirname $0`/clang{version}++ {flags} "$@" + `dirname $0`/clang{version}++ -stdlib=libc++ {flags} "$@" else # target/triple already spelled out. `dirname $0`/clang{version}++ "$@" |