X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/19cfbaf7704434842ed81ebcaa50028376f4bd6e..a3f130cbbd100c4bf662bfa0756e3d677be3632c:/projects/sgconv/build diff --git a/projects/sgconv/build b/projects/sgconv/build index 2d6ce471..1bc23718 100755 --- a/projects/sgconv/build +++ b/projects/sgconv/build @@ -85,6 +85,7 @@ then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread else + LIBICONV="-liconv" if [ "$OS" = "bsd" ] then DEFS="$DEFS -DFREE_BSD" @@ -99,6 +100,7 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread + LIBICONV="" else LIB_THREAD=-lc_r fi @@ -162,7 +164,7 @@ rm -f fake printf "Checking for iconv 2nd argument... " printf "#include \nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c -$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null +$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then printf "non-const\n" @@ -179,7 +181,7 @@ then printf "no\n" printf "Checking for -lfbclient... " printf "int main() { return 0; }\n" > build_check.c - $CXX $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no @@ -261,7 +263,7 @@ if [ $? != 0 ] then printf "no\n"; printf "Checking for -lpq... " - $CXX $CXXFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_PQ=no @@ -363,6 +365,7 @@ printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE printf "CFLAGS=$CFLAGS\n" >> $CONFFILE printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "LIBICONV=$LIBICONV\n" >> $CONFFILE printf "PREFIX=$PREFIX\n" >> $CONFFILE printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE