subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1641161 - /subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
Date Sun, 23 Nov 2014 05:45:17 GMT
Author: brane
Date: Sun Nov 23 05:45:16 2014
New Revision: 1641161

URL: http://svn.apache.org/r1641161
Log:
On second thoughts, just don't use --enable-optimize with 1.8.x builds
on the macosx build slave. Without the option, we still get the
default -O2; with that option, we get -O0, which I consider horrible.

* tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh:
   Only tell configure to --enable-optimize when we're building
   branches newer than 1.8.x.

Modified:
    subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh?rev=1641161&r1=1641160&r2=1641161&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Sun Nov 23 05:45:16
2014
@@ -64,10 +64,11 @@ cd ${abssrc}
 ./autogen.sh
 
 svnminor=$(awk '/define *SVN_VER_MINOR/ { print $3 }' subversion/include/svn_version.h)
-if [ ${svnminor} -eq 8 ]; then
-  # --enable-optimize adds -flto which breaks the 1.8 C tests because
-  # they link main() from a library.
-  extraconfig='--disable-optimize'
+
+# --enable-optimize adds -flto which breaks the 1.8 C tests because
+# they link main() from a library.
+if [ ${svnminor} -gt 8 ]; then
+  optimizeconfig=' --enable-optimize'
 fi
 
 #
@@ -79,8 +80,7 @@ cd ${absbld}
 env CC=clang CXX=clang++ \
 ${abssrc}/configure \
     --prefix="${absbld}/.install-prefix" \
-    --disable-debug \
-    --enable-optimize \
+    --disable-debug${optimizeconfig} \
     --disable-nls \
     --disable-mod-activation \
     ${aprconfig}${serfconfig} \
@@ -88,8 +88,8 @@ ${abssrc}/configure \
     --with-berkeley-db=db.h:"${SVNBB_BDB}/include":${SVNBB_BDB}/lib:db \
     --enable-javahl \
     --without-jikes \
-    --with-junit="${SVNBB_JUNIT}" \
-    ${extraconfig}
+    --with-junit="${SVNBB_JUNIT}"
+
 test -f config.log && mv config.log "${abssrc}/.test-logs/config.log"
 
 #



Mime
View raw message