Remove the -no-gcc-sysroot configure option

This option is dysfunctional since Qt 6.0. Modify the CMake variables CMAKE_SYSROOT_LINK and CMAKE_SYSROOT_COMPILE instead. Change-Id: Ib97dcc765c4644b5c3975d4b61c0e567451ea977 Reviewed-by: Alexey Edelev <[email protected]>
fwcd · May 26, 2023 · f18842d · f18842d
1 parent fcf5eb7
commit f18842d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md
@@ -76,9 +76,6 @@ The following table describes the mapping of configure options to CMake argument
 | -unity-build                          | -DQT_UNITY_BUILD=ON                               |                                                                 |
 | -unity-build-batch-size <int>         | -DQT_UNITY_BUILD_BATCH_SIZE=<int>                 |                                                                 |
 | -warnings-are-errors                  | -DWARNINGS_ARE_ERRORS=ON                          |                                                                 |
-| -no-gcc-sysroot                       | n/a                                               | The corresponding CMake variables are CMAKE_SYSROOT_LINK        |
-|                                       |                                                   | and CMAKE_SYSROOT_COMPILE.                                      |
-|                                       |                                                   | They are usually set in a toolchain file.                       |
 | -no-pkg-config                        | -DFEATURE_pkg_config=OFF                          |                                                                 |
 | -D <string>                           | -DQT_EXTRA_DEFINES=<string1>;<string2>            |                                                                 |
 | -I <string>                           | -DQT_EXTRA_INCLUDEPATHS=<string1>;<string2>       |                                                                 |

diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
@@ -61,7 +61,6 @@ qt_commandline_option(force-pkg-config TYPE void NAME pkg-config)
 qt_commandline_option(framework TYPE boolean)
 qt_commandline_option(gc-binaries TYPE boolean NAME gc_binaries)
 qt_commandline_option(gdb-index TYPE boolean NAME enable_gdb_index)
-qt_commandline_option(gcc-sysroot TYPE boolean)
 qt_commandline_option(gcov TYPE boolean)
 qt_commandline_option(gnumake TYPE boolean NAME GNUmake)
 qt_commandline_option(gui TYPE boolean)