[v4,2/6] travis: don't override prefix when cross-compiling

Message ID 1505318407-21381-3-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series
  • [v4,1/6] travis: fix powerpc test name
Related show

Commit Message

Github ODP bot Sept. 13, 2017, 4 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 175 (lumag:build-x86)
 ** https://github.com/Linaro/odp/pull/175
 ** Patch: https://github.com/Linaro/odp/pull/175.patch
 ** Base sha: fb3f36cec108ce9c55241d9f0e66d4832a552b8a
 ** Merge commit sha: 053d08aa14dd4077b17b983bac6b9930801fbcba
 **/
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/.travis.yml b/.travis.yml
index 329b9195..1ca4b5af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,7 @@  before_install:
                   BUILD_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_BUILD_GNU_TYPE` ;
                   CROSS_GNU_TYPE=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_GNU_TYPE` ;
                   CROSS_MULTIARCH=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_MULTIARCH` ;
-                  CROSS="--host="$CROSS_GNU_TYPE" --build="$BUILD_GNU_TYPE" --prefix=/usr --includedir=/usr/include/"$CROSS_MULTIARCH" --libdir=/usr/lib/"$CROSS_MULTIARCH" --libexecdir=/usr/lib/"$CROSS_MULTIARCH"" ;
+                  CROSS="--host="$CROSS_GNU_TYPE" --build="$BUILD_GNU_TYPE"" ;
                   sudo dpkg --add-architecture "$CROSS_ARCH" ;
                   sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ;
                   sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ;