commit 68b3338b709c088c1333ac6a8826adeba3160e06
author Josh Gao <jmgao@google.com> Mon Feb 01 16:52:51 2016 -0800
committer Josh Gao <jmgao@google.com> Tue Feb 02 22:19:58 2016 +0000
tree afb2c9a64a90d1d4f2eac777433cb8f3607603aa
parent b7c69f43c21ea692840d3a3c3b2cf29ece8d8b2f

Add host tag to Python install path.

Bug: http://b/26875911
Change-Id: I8962c551c90b101460fc217ccb5dbfed78c7ceb2
(cherry picked from commit 3715ca1cbce9b0959269eb367d3a252456a0ea40)

build-gdb.sh

diff --git a/build-gdb.sh b/build-gdb.sh
index 396c556..14cb56b 100755
--- a/build-gdb.sh
+++ b/build-gdb.sh
@@ -131,7 +131,7 @@
 
 python_build_install_dir ()
 {
-    echo "$PYTHON_BUILD_DIR/install/host-tools/"
+    echo "$PYTHON_BUILD_DIR/$1/install/host-tools/"
 }
 
 # $1: host system tag
@@ -209,7 +209,7 @@
     ARGS=$ARGS" --disable-sim"
     ARGS=$ARGS" --enable-gdbserver=no"
     if [ -n "$PYTHON_VERSION" ]; then
-        ARGS=$ARGS" --with-python=$(python_build_install_dir $BH_HOST_TAG)/bin/python-config.sh"
+        ARGS=$ARGS" --with-python=$(python_build_install_dir $1)/bin/python-config.sh"
         if [ $1 = windows-x86 -o $1 = windows-x86_64 ]; then
             # This is necessary for the Python integration to build.
             CFLAGS=$CFLAGS" -D__USE_MINGW_ANSI_STDIO=1"
@@ -228,7 +228,7 @@
     if [ $? -ne 0 ]; then
         mkdir -p $PACKAGE_DIR/config_logs
         find $TMPDIR -name 'config.log' | cpio -pdm $PACKAGE_DIR/config_logs
-        cp $(python_build_install_dir $BH_HOST_TAG)/bin/python-config.sh $PACKAGE_DIR/config_logs
+        cp $(python_build_install_dir $1)/bin/python-config.sh $PACKAGE_DIR/config_logs
         panic "Failed to configure/make/install gdb"
     fi
 }