diff --git a/.travis/build.sh b/.travis/build.sh index 8459da4a5..b4a0f0175 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [ "$TRAVIS_OS_NAME" = "osx" ]; then exec .travis/build-osx.sh; fi ###### Part 1: Build old QB64 ###### @@ -24,11 +24,11 @@ com_build() { com_build "libqb" "libQB" com_build "parts/video/font/ttf" "FreeType" com_build "parts/core" "FreeGLUT" - + cp -r internal/source/* internal/temp/ cd internal/c echo -n "Bootstrapping QB64..." -g++ -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lcurses -lpthread -ldl -lrt -D FREEGLUT_STATIC -DDEPENDENCY_USER_MODS -o ../../qb64_bootstrap +g++ $NOPIE -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lcurses -lpthread -ldl -lrt -D FREEGLUT_STATIC -DDEPENDENCY_USER_MODS -o ../../qb64_bootstrap if [ $? -ne 0 ]; then echo "QB64 bootstrap failed" exit 1 @@ -52,10 +52,11 @@ echo -n "Testing compile/link..." # extract g++ line cd internal/temp/ cpp_call=`awk '$1=="g++" {print $0}' < recompile_lnx.sh` +echo $cpp_call # run g++ cd ../c/ -$cpp_call -o ../../qb64_testrun +${cpp_call/-no-pie/} -o ../../qb64_testrun if [ $? -ne 0 -o ! -f ../../qb64_testrun ]; then echo "Compile/link test failed" exit 1