Author: philip
Date: Fri Mar 28 12:57:54 2014
New Revision: 1582738

URL: http://svn.apache.org/r1582738
Log:
* tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh: Work around
   --enable-optimize bug.

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=1582738&r1=1582737&r2=1582738&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh 
(original)
+++ subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Fri 
Mar 28 12:57:54 2014
@@ -23,9 +23,17 @@ set -x
 echo "============ autogen.sh"
 ./autogen.sh || exit $?
 
+SVN_VER_MINOR=`awk '/define SVN_VER_MINOR/ { print $3 }' 
subversion/include/svn_version.h`
+
 cd ../obj
 grep obj/subversion/tests /etc/mnttab > /dev/null || mount-tmpfs
 
+if [ $SVN_VER_MINOR -eq 8 ]; then
+  # A bug causes --enable-optimize to add -flto which isn't supported,
+  # adding --enable-debug reduces optimization and skips -flto.
+  OPTIONS_1_8='--enable-debug'
+fi
+
 echo "============ configure"
 ../build/configure CC='cc -m64 -v' \
   --with-apr=/export/home/wandisco/buildbot/install \
@@ -35,6 +43,7 @@ echo "============ configure"
   
--with-sqlite=/export/home/wandisco/buildbot/sqlite-amalgamation-3071501/sqlite3.c
 \
   --enable-optimize \
   --disable-shared \
+  $OPTIONS_1_8 \
   || exit $?
 
 echo "============ make"


Reply via email to