diff options
author | Daniel Stenberg <daniel@haxx.se> | 2020-07-31 20:13:54 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2020-07-31 20:13:54 +0200 |
commit | eb31033d492f5f33d0d709ac9ee32540203d12a0 (patch) | |
tree | c79315a9d51e145031805a39b49b3250176abc41 | |
parent | a517d439158e3e09b7f01c40ff4d9ade2b8338a1 (diff) | |
download | curl-eb31033d492f5f33d0d709ac9ee32540203d12a0.tar.gz |
fixup only build mesalink for those builds
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | scripts/travis/before_script.sh | 28 |
2 files changed, 16 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 362528870..dd9ab3dc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,7 +155,7 @@ jobs: - libbrotli-dev - libzstd-dev - env: - - T=debug-mesalink C="--with-mesalink --without-ssl" + - T=debug-mesalink C="--with-mesalink --without-ssl" MESALINK=yes - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" addons: apt: diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index bcc8cd4e1..9fef8f60d 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -119,20 +119,22 @@ if [ $TRAVIS_OS_NAME = linux ]; then cd $HOME/wolfssl-4.4.0-stable sudo make install - if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then - cd $HOME - curl https://sh.rustup.rs -sSf | sh -s -- -y - source $HOME/.cargo/env - curl -LO https://github.com/mesalock-linux/mesalink/archive/v1.0.0.tar.gz - tar -xzf v1.0.0.tar.gz - cd mesalink-1.0.0 - ./autogen.sh - ./configure --enable-tls13 - make - fi + if [ $MESALINK = "yes" ]; then + if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then + cd $HOME + curl https://sh.rustup.rs -sSf | sh -s -- -y + source $HOME/.cargo/env + curl -LO https://github.com/mesalock-linux/mesalink/archive/v1.0.0.tar.gz + tar -xzf v1.0.0.tar.gz + cd mesalink-1.0.0 + ./autogen.sh + ./configure --enable-tls13 + make + fi + cd $HOME/mesalink-1.0.0 + sudo make install - cd $HOME/mesalink-1.0.0 - sudo make install + fi if [ ! -e $HOME/nghttp2-1.39.2/Makefile ]; then cd $HOME |