Procházet zdrojové kódy

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

Conflicts:
	build/autotools/configure.ac
	configure
	src/generate_defs.sh
Bryan Drewery před 11 roky
rodič
revize
be3a6f1685
3 změnil soubory, kde provedl 5 přidání a 6 odebrání
  1. 1 1
      build/autotools/configure.ac
  2. 1 1
      configure
  3. 3 4
      src/generate_defs.sh

+ 1 - 1
build/autotools/configure.ac

@@ -279,7 +279,7 @@ if [[ -n "${LIBELF_BUNDLED}" ]] && [[ -f lib/libelf/configure ]]; then
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
 fi
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+CXX="$CXX" CXXFLAGS="$CXXFLAGS" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
 [
 if [ $? -ne 0 ]; then
   exit 1

+ 1 - 1
configure

@@ -10302,7 +10302,7 @@ if [ -n "${LIBELF_BUNDLED}" ] && [ -f lib/libelf/configure ]; then
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
 fi
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+CXX="$CXX" CXXFLAGS="$CXXFLAGS" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
 
 if [ $? -ne 0 ]; then
   exit 1

+ 3 - 4
src/generate_defs.sh

@@ -44,13 +44,12 @@ for file in ${files}; 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 -DGENERATE_DEFS ../${file} > $TMPFILE
+  cd src
+  $CXX $CXXFLAGS -E -I. -I.. -I../lib ${INCLUDES} -DHAVE_CONFIG_H -DGENERATE_DEFS ../${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' $TMPFILE|sort -u); do
     # Check if the typedef is already defined ...