From 33c6d15ecb9dad7ab0474471b5ac154cf3598f91 Mon Sep 17 00:00:00 2001 From: Gabe Appleton Date: Mon, 30 Sep 2019 21:20:20 -0700 Subject: [PATCH] Fix build scripts --- .scripts/shippable_script.sh | 4 ++-- .scripts/travis_script.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.scripts/shippable_script.sh b/.scripts/shippable_script.sh index 467b01c5..e6fb81bc 100644 --- a/.scripts/shippable_script.sh +++ b/.scripts/shippable_script.sh @@ -39,10 +39,10 @@ else cd pcc sed -i 's/MANPAGE=@BINPREFIX@cpp/MANPAGE=@BINPREFIX@pcc-cpp/' cc/cpp/Makefile.in ./configure --prefix=/usr --libexecdir=/usr/lib/{x86_64,i386}-linux-gnu - sudo make && make install + sudo make && sudo make install cd ../pcc-libs ./configure --prefix=/usr --libexecdir=/usr/lib/{x86_64,i386}-linux-gnu - sudo make && make install + sudo make && sudo make install cd .. else sudo apt-get install -y $COMPILER_OVERRIDE python3-pip diff --git a/.scripts/travis_script.sh b/.scripts/travis_script.sh index c89a859c..fe26881c 100644 --- a/.scripts/travis_script.sh +++ b/.scripts/travis_script.sh @@ -36,17 +36,17 @@ else if [ $pcc ]; then brew install flex bison mkdir pcc pcc-libs - wget -O - -o /dev/null http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-1.1.0.tgz | tar -xz --no-seek -C pcc --strip-components=1 - wget -O - -o /dev/null http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-libs-1.1.0.tgz | tar -xz --no-seek -C pcc-libs --strip-components=1 + wget -O - -o /dev/null http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-1.1.0.tgz | tar -xz -C pcc --strip-components=1 + wget -O - -o /dev/null http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-libs-1.1.0.tgz | tar -xz -C pcc-libs --strip-components=1 cd pcc ./configure - sudo make && make install + sudo make && sudo make install cd ../pcc-libs ./configure - sudo make && make install + sudo make && sudo make install cd .. - else - brew install $COMPILER_OVERRIDE; + elif [ $GCC_OVERRIDE ]; then + brew install gcc; fi make ctest; fi