Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 65f634bdb25f824e0fb16a4d8e6c012d4d7fbc08..995a9373a541a764239701ab6850c94f23c1e184 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -95,7 +95,6 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread

-                LIBICONV=""

             else
                 LIB_THREAD=-lc_r
             fi
             else
                 LIB_THREAD=-lc_r
             fi


@@ -159,7 +158,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\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"
 if [ $? != 0 ]
 then
     printf "non-const\n"