diff --git a/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset b/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset index 593ddafc7..09491fcba 100644 --- a/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset +++ b/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset @@ -1266,3 +1266,30 @@ index 5f20853..9c26380 100644 -- 1.8.3.4 + +From e8af83035ae75596f931c7e8a2b5b47d8160933a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 10 Mar 2014 14:11:01 +0100 +Subject: Fix the architecture detection regexp again. + +Turns out it didn't work with the main compiler on a gcc4 install. +This new regexp was written by GSoC candidate akshay1994, part of his efforts +to build WebKit and fix one ticket for it. Thanks for getting through +this! + +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index af6697a..920ae8f 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -40,7 +40,7 @@ execute_process( + RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND + OUTPUT_STRIP_TRAILING_WHITESPACE) + +-string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[\n]*)?" _dummy "${_HAIKU_SEARCH_DIRS}\n") ++string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n") + set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}") + + if(NOT CMAKE_HAIKU_SECONDARY_ARCH) +-- +1.8.3.4 +