[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7106-g6082047

[Rolf Eike Beer]

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  6082047484e8d8957f3b68fe67113582b7100fac (commit)
       via  2a16821e802b4e96dbdbbca335bd676889cb6232 (commit)
      from  3102e2914eec3e34afb2e447ec1b47a3c5ad1902 (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=6082047484e8d8957f3b68fe67113582b7100fac
commit 6082047484e8d8957f3b68fe67113582b7100fac
Merge: 3102e29 2a16821
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 14 17:41:52 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 14 17:41:52 2014 -0500

    Merge topic 'hppa-bootstrap' into next
    
    2a16821e bootstrap: improve ld flag


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a16821e802b4e96dbdbbca335bd676889cb6232
commit 2a16821e802b4e96dbdbbca335bd676889cb6232
Author:     Rolf Eike Beer <kde at opensource.sf-tec.de>
AuthorDate: Tue Jan 14 23:16:45 2014 +0100
Commit:     Rolf Eike Beer <kde at opensource.sf-tec.de>
CommitDate: Tue Jan 14 23:16:45 2014 +0100

    bootstrap: improve ld flag
    
    Found 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:
 bootstrap |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
CMake