Title: [215156] trunk
- Revision
- 215156
- Author
- commit-qu...@webkit.org
- Date
- 2017-04-08 17:50:32 -0700 (Sat, 08 Apr 2017)
Log Message
Elftoolchain ar doesn't support response files
https://bugs.webkit.org/show_bug.cgi?id=170105
Patch by Ting-Wei Lan <lant...@gmail.com> 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (215155 => 215156)
--- trunk/ChangeLog 2017-04-09 00:21:11 UTC (rev 215155)
+++ trunk/ChangeLog 2017-04-09 00:50:32 UTC (rev 215156)
@@ -1,3 +1,18 @@
+2017-04-08 Ting-Wei Lan <lant...@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 <mcatanz...@igalia.com>
Unreviewed, rolling out r215150.
Modified: trunk/Source/cmake/OptionsCommon.cmake (215155 => 215156)
--- trunk/Source/cmake/OptionsCommon.cmake 2017-04-09 00:21:11 UTC (rev 215155)
+++ trunk/Source/cmake/OptionsCommon.cmake 2017-04-09 00:50:32 UTC (rev 215156)
@@ -215,8 +215,11 @@
if (NOT APPLE)
# 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 ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
