X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9ed663cdb641ed18d1b121017ea640df3daddfdc..d49162286e811faacd7d7f3277da61efdfb635db:/projects/sgconf_xml/build?ds=inline diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build index 21c32562..97970758 100755 --- a/projects/sgconf_xml/build +++ b/projects/sgconf_xml/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -48,6 +51,7 @@ then 6) OS=bsd5;; 7) OS=bsd7;; 8) OS=bsd7;; + 9) OS=bsd7;; *) OS=unknown;; esac MAKE="gmake" @@ -74,7 +78,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -88,7 +91,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -122,7 +124,7 @@ echo "found" echo -n "Checking endianess... " echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c -$CC $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null +$CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then echo "FAIL!" @@ -134,10 +136,12 @@ else then ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" + CFLAGS="$CFLAGS -DARCH_LE" echo "Little Endian" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" + CFLAGS="$CFLAGS -DARCH_BE" echo "Big Endian" fi fi @@ -165,6 +169,7 @@ fi echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE @@ -179,9 +184,8 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CXXFLAGS" >> $CONFFILE +echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE echo "PREFIX=$PREFIX" >> $CONFFILE echo "BIN_MODE=$BIN_MODE" >> $CONFFILE