[Cmake-commits] CMake branch, next, updated. v2.8.9-1228-gc196eca

[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  c196eca1d04bcb78f47bd70dae4ae82b438ff315 (commit)
       via  ad7f3d1386193c73156e0fae975d3e52b0f8ee7f (commit)
      from  40eca8d5b9132059d2c9a3ab07b91be7dbce822a (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=c196eca1d04bcb78f47bd70dae4ae82b438ff315
commit c196eca1d04bcb78f47bd70dae4ae82b438ff315
Merge: 40eca8d ad7f3d1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 29 12:42:58 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 29 12:42:58 2012 -0400

    Merge topic 'parisc-default-flags' into next
    
    ad7f3d1 set default linker flags for building on Linux/PA-RISC also during bootstrap


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad7f3d1386193c73156e0fae975d3e52b0f8ee7f
commit ad7f3d1386193c73156e0fae975d3e52b0f8ee7f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 29 17:42:42 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 29 17:42:42 2012 +0100

    set default linker flags for building on Linux/PA-RISC also during bootstrap

diff --git a/bootstrap b/bootstrap
index 713f01f..a0529f2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -93,6 +93,19 @@ else
   cmake_system_openvms=false
 fi
 
+# Determine whether this is Linux
+if echo "${cmake_system}" | grep Linux >/dev/null 2>&1; then
+  cmake_system_linux=true
+  # find out if it is a HP PA-RISC machine
+  if uname -m | grep parisc >/dev/null 2>&1; then
+    cmake_machine_parisc=true
+  else
+    cmake_machine_parisc=false
+  fi
+else
+  cmake_system_linux=false
+fi
+
 # Choose the generator to use for bootstrapping.
 if ${cmake_system_mingw}; then
   # Bootstrapping from an MSYS prompt.
@@ -678,6 +691,14 @@ if ${cmake_system_haiku}; then
   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
 fi
 
+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.*"
+  fi
+fi
+
 #-----------------------------------------------------------------------------
 # Detect known toolchains on some platforms.
 cmake_toolchains=''

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

Summary of changes:
 bootstrap |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake