diff options
| author | Dan Albert <danalbert@google.com> | 2017-09-14 11:27:03 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-09-14 11:43:56 -0700 |
| commit | 09f8656ef9e3d16f0831c29b4d822c85c544b061 (patch) | |
| tree | 7d109b5b4ee813cb5da29ca966c782d5c11e625b /sources | |
| parent | 32f97f2ff12d54a8c71e06b70c6f1d38520a5400 (diff) | |
| download | ndk-09f8656ef9e3d16f0831c29b4d822c85c544b061.tar.gz | |
Don't use TMPDIR when building gnustl.
Test: TMPDIR=foo ./checkbuild.py --module gnustl
Bug: None
Change-Id: I3d2c3d148f150e3ba9bf6a2e96b95c8f92180fa5
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh | 9 | ||||
| -rwxr-xr-x | sources/cxx-stl/gnu-libstdc++/build.py | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh index b8974b2cd..b11211d61 100755 --- a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh +++ b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh @@ -56,8 +56,7 @@ NDK_DIR= register_var_option "--ndk-dir=<path>" NDK_DIR "Specify NDK root path for the build." BUILD_DIR= -OPTION_BUILD_DIR= -register_var_option "--build-dir=<path>" OPTION_BUILD_DIR "Specify temporary build dir." +register_var_option "--build-dir=<path>" BUILD_DIR "Specify temporary build dir." OUT_DIR= register_var_option "--out-dir=<path>" OUT_DIR "Specify output directory directly." @@ -105,12 +104,6 @@ else fi fi -if [ -z "$OPTION_BUILD_DIR" ]; then - BUILD_DIR=$NDK_TMPDIR/build-gnustl -else - BUILD_DIR=$OPTION_BUILD_DIR -fi - HOST_TAG_LIST="$HOST_TAG $HOST_TAG32" rm -rf "$BUILD_DIR" diff --git a/sources/cxx-stl/gnu-libstdc++/build.py b/sources/cxx-stl/gnu-libstdc++/build.py index 2e044eca1..93e93c775 100755 --- a/sources/cxx-stl/gnu-libstdc++/build.py +++ b/sources/cxx-stl/gnu-libstdc++/build.py @@ -43,13 +43,15 @@ def main(args): for arch in arches: abis.extend(build_support.arch_to_abis(arch)) + build_dir = os.path.join(args.out_dir, 'gnustl') + print('Building libstdc++ for ABIs: {}'.format(' '.join(abis))) abis_arg = '--abis={}'.format(','.join(abis)) ndk_dir_arg = '--ndk-dir={}'.format(build_support.ndk_path()) build_cmd = [ 'bash', 'build-gnu-libstdc++.sh', abis_arg, ndk_dir_arg, build_support.jobs_arg(), build_support.toolchain_path(), - '--with-debug-info', + '--with-debug-info', '--build-dir={}'.format(build_dir), ] build_support.build(build_cmd, args) |