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 | 32f97f2ff12d54a8c71e06b70c6f1d38520a5400 (patch) | |
| tree | 7b37900dd00e71086b7e21b4eec4f5a109affe7f /sources | |
| parent | ad03538db2067f144049e1afb39a11afa0e77aa4 (diff) | |
| download | ndk-32f97f2ff12d54a8c71e06b70c6f1d38520a5400.tar.gz | |
Don't use TMPDIR when building make.
Test: TMPDIR=foo ./checkbuild.py --module host-tools
Bug: None
Change-Id: I31adc8091c0ea114b5eec52e4bbd6a5bdea82b29
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/host-tools/make-3.81/build-make.sh | 7 | ||||
| -rwxr-xr-x | sources/host-tools/make-3.81/build.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sources/host-tools/make-3.81/build-make.sh b/sources/host-tools/make-3.81/build-make.sh index b6200226e..edee4a5fd 100755 --- a/sources/host-tools/make-3.81/build-make.sh +++ b/sources/host-tools/make-3.81/build-make.sh @@ -42,6 +42,9 @@ register_var_option "--make=<path>" GNUMAKE "Specify GNU Make program for the bu PACKAGE_DIR= register_var_option "--package-dir=<path>" PACKAGE_DIR "Archive binaries into package directory" +BUILD_DIR= +register_var_option "--build-dir=<path>" BUILD_DIR "Specify temporary build dir." + extract_parameters "$@" if [ -z "$CUSTOM_OUT" ]; then @@ -62,7 +65,7 @@ log "Using sources from: $GNUMAKE_SRCDIR" prepare_abi_configure_build prepare_host_build -TMP_SRCDIR=$NDK_TMPDIR/src +TMP_SRCDIR=$BUILD_DIR/src # We need to copy the sources to a temporary directory because # the build system will modify some documentation files in the @@ -71,7 +74,7 @@ log "Copying sources to temporary directory: $TMP_SRCDIR" mkdir -p "$TMP_SRCDIR" && copy_directory "$GNUMAKE_SRCDIR" "$TMP_SRCDIR" fail_panic "Could not copy GNU Make sources to: $TMP_SRCDIR" -BUILD_DIR=$NDK_TMPDIR/build +BUILD_DIR=$BUILD_DIR/build CONFIGURE_FLAGS="--disable-nls --disable-rpath" if [ "$MINGW" = "yes" ]; then diff --git a/sources/host-tools/make-3.81/build.py b/sources/host-tools/make-3.81/build.py index 5f9d670ee..afe4d27d6 100755 --- a/sources/host-tools/make-3.81/build.py +++ b/sources/host-tools/make-3.81/build.py @@ -36,6 +36,8 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') + build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'make')) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': |