X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/463995e9899beaf6fa381d68d8050b2c449142ff..868373be936ab08e51e1512a5173674ce64a2c70:/projects/rscriptd/build?ds=sidebyside diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 173e3afc..38ec5fc1 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -65,11 +65,11 @@ echo "########################################################################## echo " Building rscriptd for $sys $release" echo "#############################################################################" -STG_LIBS="stg_logger.lib - stg_locker.lib +STG_LIBS="logger.lib + locker.lib crypto.lib common.lib - script_executer.lib + scriptexecuter.lib conffiles.lib" if [ "$OS" = "linux" ] @@ -94,28 +94,38 @@ else SHELL="/usr/local/bin/bash" fi -echo -n "Checking gcc... " -gcc --version > /dev/null 2> /dev/null +if [ -z "$CC" ] +then + CC=gcc +fi + +if [ -z "$CXX" ] +then + CXX=g++ +fi + +echo -n "Checking CC... " +$CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then echo "FAIL!" - echo "gcc not found" + echo "$CC not found" exit; fi echo "found" -echo -n "Checking g++... " -g++ --version > /dev/null 2> /dev/null +echo -n "Checking CXX... " +$CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then echo "FAIL!" - echo "g++ not found" + echo "$CXX not found" exit; fi echo "found" echo -n "Checking endianess... " echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c -gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null +$CC $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then echo "FAIL!"