X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e1999cff4c8d39584a6723cf0ff2ffec9425c4da..refs/heads/stg-2.409-radius:/projects/rscriptd/build diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 65f634bd..8c12e527 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -55,7 +55,7 @@ if [ "$sys" = "Darwin" ] then OS=darwin ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" + MAKE="make" fi if [ "$OS" = "unknown" ] @@ -95,7 +95,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi @@ -159,7 +158,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 $LIBICONV -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"