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:46:38 -0700 |
| commit | df6c9941ead23aa455b562b538516644ce6a0f1c (patch) | |
| tree | f2599a0ca41726312d7b6d05a006cef260e2b5fa | |
| parent | 09f8656ef9e3d16f0831c29b4d822c85c544b061 (diff) | |
| download | ndk-df6c9941ead23aa455b562b538516644ce6a0f1c.tar.gz | |
Don't use TMPDIR when building stlport.
Test: TMPDIR=foo ./checkbuild.py --module stlport
Bug: None
Change-Id: If750217d31ae4660b771b025574479439c2b9bbb
| -rwxr-xr-x | build/tools/build-cxx-stl.sh | 8 | ||||
| -rwxr-xr-x | sources/cxx-stl/stlport/build.py | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh index cf967b290..ef7a507ad 100755 --- a/build/tools/build-cxx-stl.sh +++ b/build/tools/build-cxx-stl.sh @@ -62,8 +62,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." @@ -143,11 +142,6 @@ case $CXX_STL in ;; esac -if [ -z "$OPTION_BUILD_DIR" ]; then - BUILD_DIR=$NDK_TMPDIR/build-$CXX_STL -else - BUILD_DIR=$OPTION_BUILD_DIR -fi rm -rf "$BUILD_DIR" mkdir -p "$BUILD_DIR" fail_panic "Could not create build directory: $BUILD_DIR" diff --git a/sources/cxx-stl/stlport/build.py b/sources/cxx-stl/stlport/build.py index 9cc166b8b..44b7c4541 100755 --- a/sources/cxx-stl/stlport/build.py +++ b/sources/cxx-stl/stlport/build.py @@ -45,6 +45,7 @@ def main(args): print('Building stlport for ABIs: {}'.format(' '.join(abis))) + build_dir = os.path.join(args.out_dir, 'stlport') abis_arg = '--abis={}'.format(','.join(abis)) ndk_dir_arg = '--ndk-dir={}'.format(build_support.ndk_path()) script = build_support.ndk_path('build/tools/build-cxx-stl.sh') @@ -52,6 +53,7 @@ def main(args): 'bash', script, '--stl=stlport', abis_arg, ndk_dir_arg, build_support.jobs_arg(), build_support.toolchain_path(), '--with-debug-info', '--llvm-version=3.6', + '--build-dir={}'.format(build_dir), ] build_support.build(build_cmd, args) |