summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 16:07:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 16:07:02 +0000
commit17393ac614fa6defdd502002af6eb07c23136bbc (patch)
tree3a55205807be744582fb7487923c47d8f7c98661
parente599ccbe3ceff20a4076df89821b8afbd07ea48a (diff)
parent69a8b8a8a35d8922c2dcc16f67f1a7783ffe7729 (diff)
downloadbuild-17393ac614fa6defdd502002af6eb07c23136bbc.tar.gz
Merge "abi/bootstrap: upgrade elfutils version 0.176 -> 0.178" am: 69a8b8a8a3
Change-Id: I27e768e464a7655a0f11d0483e6a1df72c046f35
-rwxr-xr-xabi/bootstrap9
1 files changed, 7 insertions, 2 deletions
diff --git a/abi/bootstrap b/abi/bootstrap
index 38b7d945..3c2e3ff1 100755
--- a/abi/bootstrap
+++ b/abi/bootstrap
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ELFUTILS_VERSION=elfutils-0.176
+ELFUTILS_VERSION=elfutils-0.178
ABIGAIL_VERSION=4752d416
NUM_CORES=$(cat /proc/cpuinfo | grep -c proc)
@@ -30,6 +30,9 @@ if [ -e "${OUT_DIR}" ]; then
read
fi
+# Clear out the OUT_DIR
+rm -rf "${OUT_DIR}"
+
# Add the future PATHs to the environment for the builds to pick up
export PATH="${OUT_DIR}/bin:${PATH}"
export LD_LIBRARY_PATH="${OUT_DIR}/lib:${OUT_DIR}/lib/elfutils:${LD_LIBRARY_PATH}"
@@ -69,7 +72,9 @@ pushd "${ELFUTILS_SRC}"
autoreconf -i --force
mkdir -p build/
pushd build/
- ../configure --prefix="${OUT_DIR}" --enable-maintainer-mode
+ ../configure --prefix="${OUT_DIR}" \
+ --enable-maintainer-mode \
+ --disable-debuginfod
make -j${NUM_CORES}
make -j${NUM_CORES} install
popd