QB64/qb64
QB64/qb64
1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-05 15:50:25 +00:00
Code Releases Wiki Activity

Omit -no-pie for travis build

Browse source
This commit is contained in:
Luke Ceddia 2019-04-07 18:39:50 +10:00
parent 18f52b4fa5
commit dd92c17da6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis/build.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
if [ "$TRAVIS_OS_NAME" = "osx" ]; then exec .travis/build-osx.sh; fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then exec .travis/build-osx.sh; fi
###### Part 1: Build old QB64 ###### ###### Part 1: Build old QB64 ######
@ -28,7 +28,7 @@ com_build "parts/core" "FreeGLUT"
cp -r internal/source/* internal/temp/ cp -r internal/source/* internal/temp/
cd internal/c cd internal/c
echo -n "Bootstrapping QB64..." 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 if [ $? -ne 0 ]; then
echo "QB64 bootstrap failed" echo "QB64 bootstrap failed"
exit 1 exit 1
@ -52,10 +52,11 @@ echo -n "Testing compile/link..."
# extract g++ line # extract g++ line
cd internal/temp/ cd internal/temp/
cpp_call=`awk '$1=="g++" {print $0}' < recompile_lnx.sh` cpp_call=`awk '$1=="g++" {print $0}' < recompile_lnx.sh`
echo $cpp_call
# run g++ # run g++
cd ../c/ cd ../c/
$cpp_call -o ../../qb64_testrun ${cpp_call/-no-pie/} -o ../../qb64_testrun
if [ $? -ne 0 -o ! -f ../../qb64_testrun ]; then if [ $? -ne 0 -o ! -f ../../qb64_testrun ]; then
echo "Compile/link test failed" echo "Compile/link test failed"
exit 1 exit 1