This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dcbdaeeea15527629eb906460d506fa22ca39dec (commit)
via ca63bb1001dea6929e194ac15921fdeb7d434dcd (commit)
from cc8c8ec925cf3f0cae69ab0a4649b0620489e2c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcbdaeeea15527629eb906460d506fa22ca39dec
commit dcbdaeeea15527629eb906460d506fa22ca39dec
Merge: cc8c8ec ca63bb1
Author: Rolf Eike Beer <[email protected]>
AuthorDate: Thu Sep 12 15:06:58 2013 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Sep 12 15:06:58 2013 -0400
Merge topic 'hppa-bootstrap' into next
ca63bb1 bootstrap: try better workaround for builds on Linux/HPPA
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd
commit ca63bb1001dea6929e194ac15921fdeb7d434dcd
Author: Rolf Eike Beer <[email protected]>
AuthorDate: Thu Sep 12 20:59:11 2013 +0200
Commit: Rolf Eike Beer <[email protected]>
CommitDate: Thu Sep 12 20:59:11 2013 +0200
bootstrap: try better workaround for builds on Linux/HPPA
The workaround currently present works fine without -O or with -O1, but
fails
with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as
resulting in
bugs like this:
https://bugs.gentoo.org/473276
Prevent the workaround for higher optimization levels to make bootstrapping
more likely to succeed.
This is still a workaround as ld still keeps crashing in some situations.
diff --git a/bootstrap b/bootstrap
index fb4a0a0..9784d5d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -692,7 +692,10 @@ if ${cmake_system_linux}; then
# avoid binutils problem with large binaries, e.g. when building CMake in
debug mode
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
if ${cmake_machine_parisc}; then
- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
+ # if -O[s23] is given the effect is inverted, so do not use the flag then
+ if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`"
!= "-Os" ]; then
+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
+ fi
fi
fi
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
