Title: [289473] trunk
- Revision
- 289473
- Author
- [email protected]
- Date
- 2022-02-09 08:34:31 -0800 (Wed, 09 Feb 2022)
Log Message
[CMake] REGRESSION(r288994): Setting multiple values in LDFLAGS causes incorrect linker detection
https://bugs.webkit.org/show_bug.cgi?id=236365
Reviewed by Martin Robinson.
* Source/cmake/OptionsCommon.cmake: Use separate_arguments() to turn plain command strings
into lists of strings, which can then be passed down to execute_process() as it knows how
to handle lists properly.
Modified Paths
Diff
Modified: trunk/ChangeLog (289472 => 289473)
--- trunk/ChangeLog 2022-02-09 16:15:59 UTC (rev 289472)
+++ trunk/ChangeLog 2022-02-09 16:34:31 UTC (rev 289473)
@@ -1,3 +1,14 @@
+2022-02-09 Adrian Perez de Castro <[email protected]>
+
+ [CMake] REGRESSION(r288994): Setting multiple values in LDFLAGS causes incorrect linker detection
+ https://bugs.webkit.org/show_bug.cgi?id=236365
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/OptionsCommon.cmake: Use separate_arguments() to turn plain command strings
+ into lists of strings, which can then be passed down to execute_process() as it knows how
+ to handle lists properly.
+
2022-02-09 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.35.3 release
Modified: trunk/Source/cmake/OptionsCommon.cmake (289472 => 289473)
--- trunk/Source/cmake/OptionsCommon.cmake 2022-02-09 16:15:59 UTC (rev 289472)
+++ trunk/Source/cmake/OptionsCommon.cmake 2022-02-09 16:34:31 UTC (rev 289473)
@@ -36,11 +36,16 @@
endif ()
# Determine which linker is being used with the chosen linker flags.
+separate_arguments(LD_VERSION_COMMAND UNIX_COMMAND
+ "${CMAKE_C_COMPILER} ${CMAKE_EXE_LINKER_FLAGS} -Wl,--version"
+)
execute_process(
- COMMAND ${CMAKE_C_COMPILER} ${CMAKE_EXE_LINKER_FLAGS} -Wl,--version
+ COMMAND ${LD_VERSION_COMMAND}
OUTPUT_VARIABLE LD_VERSION
ERROR_QUIET
)
+unset(LD_VERSION_COMMAND)
+
set(LD_SUPPORTS_GDB_INDEX TRUE)
set(LD_SUPPORTS_SPLIT_DEBUG TRUE)
set(LD_SUPPORTS_THIN_ARCHIVES TRUE)
@@ -69,12 +74,15 @@
message(STATUS " Linker supports --disable-new-dtags - ${LD_SUPPORTS_DISABLE_NEW_DTAGS}")
# Determine whether the archiver in use supports thin archives.
+separate_arguments(AR_VERSION_COMMAND UNIX_COMMAND "${CMAKE_AR} -V")
execute_process(
- COMMAND ${CMAKE_AR} -V
+ COMMAND ${AR_VERSION_COMMAND}
OUTPUT_VARIABLE AR_VERSION
RESULT_VARIABLE AR_STATUS
ERROR_QUIET
)
+unset(AR_VERSION_COMMAND)
+
set(AR_SUPPORTS_THIN_ARCHIVES FALSE)
if (AR_STATUS EQUAL 0)
if (AR_VERSION MATCHES "^GNU ar ")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
