Parcourir la source

Don't hide errors building symbols and be sure to pass in proper -std

Bryan Drewery il y a 11 ans
Parent
commit
4b0c795a10
3 fichiers modifiés avec 5 ajouts et 6 suppressions
  1. 1 1
      build/autotools/configure.ac
  2. 1 1
      configure
  3. 3 4
      src/generate_defs.sh

+ 1 - 1
build/autotools/configure.ac

@@ -257,5 +257,5 @@ if [[ -f lib/bdlib/configure ]]; then
 fi
 AC_OUTPUT
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" \
+CXX="$CXX" CXXFLAGS="$CXXFLAGS" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" \
   SED="$SED" src/generate_defs.sh || exit 1

+ 1 - 1
configure

@@ -10317,5 +10317,5 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" \
+CXX="$CXX" CXXFLAGS="$CXXFLAGS" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" \
   SED="$SED" src/generate_defs.sh || exit 1

+ 3 - 4
src/generate_defs.sh

@@ -82,13 +82,12 @@ for file in $(grep -l DLSYM_GLOBAL src/*.c|grep -v "src/_"); do
   echo "extern \"C\" {" > $defsFile_wrappers
   echo "extern \"C\" {" > $defsFile_post
 
-  cd src >/dev/null 2>&1
-  $CXX -E -I. -I.. -I../lib ${INCLUDES} -DHAVE_CONFIG_H ../${file} > $TMPFILE 2> /dev/null
+  cd src
+  $CXX $CXXFLAGS -E -I. -I.. -I../lib ${INCLUDES} -DHAVE_CONFIG_H ../${file} > $TMPFILE
   # Fix wrapped prototypes
   $SED -e :a -e N -e '$!ba' -e 's/,\n/,/g' $TMPFILE > $TMPFILE.sed
   mv $TMPFILE.sed $TMPFILE
-
-  cd .. >/dev/null 2>&1
+  cd ..
 
   for symbol in $($SED -n -e 's/.*DLSYM_GLOBAL(.*, \([^)]*\).*/\1/p' $file|sort -u); do
     # Check if the typedef is already defined ...