subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1641163 - /subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
Date Sun, 23 Nov 2014 06:16:09 GMT
Author: brane
Date: Sun Nov 23 06:16:09 2014
New Revision: 1641163

URL: http://svn.apache.org/r1641163
Log:
Replicate r1641161 for the svn-sparc-solaris buildslave.

* tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh:
   Only tell configure to --enable-optimize when building
   branches newer than 1.8.x.

Modified:
    subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh

Modified: subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh?rev=1641163&r1=1641162&r2=1641163&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Sun Nov 23 06:16:09
2014
@@ -28,9 +28,10 @@ SVN_VER_MINOR=`awk '/define SVN_VER_MINO
 cd ../obj
 grep obj/subversion/tests /etc/mnttab > /dev/null || mount-tmpfs
 
-if [ $SVN_VER_MINOR -eq 8 ]; then
-  # A bug causes 1.8 --enable-optimize to add -flto which isn't supported
-  OPTIONS_1_8='--disable-optimize'
+# --enable-optimize adds -flto which breaks the 1.8 C tests because
+# they link main() from a library.
+if [ $SVN_VER_MINOR -gt 8 ]; then
+  OPTIMIZE_OPTION='--enable-optimize'
 fi
 
 echo "============ configure"
@@ -42,7 +43,7 @@ echo "============ configure"
   --with-sqlite=/export/home/wandisco/buildbot/sqlite-amalgamation-3071501/sqlite3.c \
   --enable-optimize \
   --disable-shared \
-  $OPTIONS_1_8 \
+  $OPTIMIZE_OPTION \
   || exit $?
 
 echo "============ make"



Mime
View raw message