Changeset 215156 in webkit

Timestamp:

Apr 8, 2017 5:50:32 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Elftoolchain ar doesn't support response files
​https://bugs.webkit.org/show_bug.cgi?id=170105

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2017-04-08
Reviewed by Michael Catanzaro.

WebKit enables the use of response files when cmake and ninja is used.
However, the default implementation of ar command used in FreeBSD, which
is part of elftoolchain project, doesn't support reading arguments from
response files. To avoid causing undefined reference error on FreeBSD,
we disable the use of response files when elftoolchain ar is detected.

• Source/cmake/OptionsCommon.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-04-08  Ting-Wei Lan  <lantw44@gmail.com>
+
+        Elftoolchain ar doesn't support response files
+        https://bugs.webkit.org/show_bug.cgi?id=170105
+
+        Reviewed by Michael Catanzaro.
+
+        WebKit enables the use of response files when cmake and ninja is used.
+        However, the default implementation of ar command used in FreeBSD, which
+        is part of elftoolchain project, doesn't support reading arguments from
+        response files. To avoid causing undefined reference error on FreeBSD,
+        we disable the use of response files when elftoolchain ar is detected.
+
+        * Source/cmake/OptionsCommon.cmake:
+
 2017-04-08  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -216 +216 @@
    # If using Ninja with cmake >= 3.6.0 and icecream, then the build is broken
    # if enable the response files. See https://bugs.webkit.org/show_bug.cgi?id=168770
-   if (NOT ((((${CMAKE_CXX_COMPILER} MATCHES ".*ccache.*") AND ($ENV{CCACHE_PREFIX} MATCHES ".*icecc.*")) OR (${CMAKE_CXX_COMPILER} MATCHES ".*icecc.*")) AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
-       set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
+   if (NOT ((((${CMAKE_CXX_COMPILER} MATCHES ".*ccache.*") AND ($ENV{CCACHE_PREFIX} MATCHES ".*icecc.*"))
+        OR (${CMAKE_CXX_COMPILER} MATCHES ".*icecc.*")
+        OR (${AR_VERSION} MATCHES "^BSD ar [^ ]* - libarchive"))
+       AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
+      set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
    endif ()
 endif ()