[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7116-g52d4e95

[Brad King]

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  52d4e953d860aa48de4f961251b745710d63de0f (commit)
       via  b22a0f15de36d7b69f136b75e091adca145e0251 (commit)
      from  429cd41aaec5722de52c59369b55e1ff93aaaf7b (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=52d4e953d860aa48de4f961251b745710d63de0f
commit 52d4e953d860aa48de4f961251b745710d63de0f
Merge: 429cd41 b22a0f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 15 10:07:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 15 10:07:47 2014 -0500

    Merge topic 'hppa-bootstrap' into next
    
    b22a0f15 bootstrap: improve ld flag for Linux/HPPA builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b22a0f15de36d7b69f136b75e091adca145e0251
commit b22a0f15de36d7b69f136b75e091adca145e0251
Author:     Rolf Eike Beer <kde at opensource.sf-tec.de>
AuthorDate: Tue Jan 14 23:16:45 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 15 10:06:07 2014 -0500

    bootstrap: improve ld flag for Linux/HPPA builds
    
    Follow up commit ca63bb10 (bootstrap: try better workaround for builds
    on Linux/HPPA, 2013-09-12) with an improved ld flag.
    
    Suggested-by: Guy Martin

diff --git a/bootstrap b/bootstrap
index fcab0cf..c0a3e3b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -739,10 +739,7 @@ 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
-    # 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
+    cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
   fi
 fi
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake