fix: jjb: always set LIBDIR_ARCH

Change-Id: Ie3e6f4f84524bed315446c09525738f7b8dcd268
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 5756c8ea3bd07814f41d1c2866746a72337d89d4..8ab926154bb2cf2dacc373275ce5dc20dae54492 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -106,6 +106,7 @@ SRCDIR="$WORKSPACE/src/babeltrace"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -113,8 +114,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 8c875432c0e9eaae06798ef594e8d1c3725866be..6fe33b5b696449963d4474a7cd2fe8f8af5fe86d 100755 (executable)
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -98,6 +98,7 @@ SRCDIR="$WORKSPACE/src/liburcu"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -105,8 +106,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 1f64168c6018bb84745e4268e75980965a1b613a..c67802a2f4167626af9e738db900817cc6e125b8 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -115,6 +115,7 @@ SRCDIR="$WORKSPACE/src/lttng-tools"
 TAPDIR="$WORKSPACE/tap"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -122,8 +123,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 65c405c5e1093d167232ccf460378cc68d5913cc..44e0183e637f5dd80f891e9e41022d16c3543328 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -98,6 +98,7 @@ SRCDIR="$WORKSPACE/src/lttng-ust"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
 LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
 
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
@@ -105,8 +106,6 @@ if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release
     # Detect the userspace bitness in a distro agnostic way
     if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
         LIBDIR_ARCH="${LIBDIR}64"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi