[patch] HPPA build fix

cmake-2.8.12.2-hppa-bootstrap.patch (text/plain), 1.17 KB, created by Rolf Eike Beer on 2014-01-31 19:55:41 UTC

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 20f5dec..24ac58d 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -66,5 +66,5 @@ endif ()
 # 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_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
 endif ()
diff --git a/bootstrap b/bootstrap
index 9784d5d..51d067e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -692,10 +692,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