X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/463995e9899beaf6fa381d68d8050b2c449142ff..a3a0464acbfeba90954fb4b7c583657cdd15ee5c:/projects/rlm_stg/build diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build index 1405d47e..6275bb17 100755 --- a/projects/rlm_stg/build +++ b/projects/rlm_stg/build @@ -12,6 +12,8 @@ BUILD_DIR=`pwd` CONFFILE="../../Makefile.conf" PREFIX="/" BIN_MODE=0755 +DATA_MODE=0644 +DIR_MODE=0755 OWNER=root if [ -z $1 ] @@ -22,7 +24,7 @@ else then DEFS="-DDEBUG" MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -g3 -W -Wall" + CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" else MAKEOPTS="-j1" fi @@ -87,28 +89,38 @@ else CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM" 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!" @@ -144,11 +156,13 @@ do done echo "" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE +echo "CFLAGS=$CXXFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE echo "PREFIX=$PREFIX" >> $CONFFILE echo "BIN_MODE=$BIN_MODE" >> $CONFFILE echo "DATA_MODE=$DATA_MODE" >> $CONFFILE +echo "DIR_MODE=$DIR_MODE" >> $CONFFILE echo "OWNER=$OWNER" >> $CONFFILE echo "SHELL=$SHELL" >> $CONFFILE $MAKE $MAKEOPTS