Skip to content

Set CMAKE_OSX_SYSROOT automatically #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keith wants to merge 4 commits into
base: main
Choose a base branch
from
+4 −0
Open

Set CMAKE_OSX_SYSROOT automatically #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef9808e
Set CMAKE_OSX_SYSROOT automatically
keith Jan 29, 2025
973007c
update tests
keith Jan 29, 2025
b2b6c87
crosstool file vars are sorted before being printer
cerisier Nov 23, 2025
30695f9
Merge branch 'main' into ks/set-cmake_osx_sysroot-automatically
cerisier Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions foreign_cc/private/cmake_script.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ def _fill_crossfile_from_toolchain(workspace_name, tools, flags, target_os):
_sysroot = _find_in_cc_or_cxx(flags, "sysroot")
if _sysroot:
dict["CMAKE_SYSROOT"] = _absolutize(workspace_name, _sysroot)
dict["CMAKE_OSX_SYSROOT"] = _absolutize(workspace_name, _sysroot)

_ext_toolchain_cc = _find_flag_value(flags.cc, "gcc_toolchain")
if _ext_toolchain_cc:
Expand Down
3 changes: 3 additions & 0 deletions test/cmake_text_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ def _fill_crossfile_from_toolchain_test(ctx):
"CMAKE_C_FLAGS_INIT": "-cc-flag -gcc_toolchain cc-toolchain",
"CMAKE_EXE_LINKER_FLAGS_INIT": "executable",
"CMAKE_MODULE_LINKER_FLAGS_INIT": " ".join(inputs[1]),
"CMAKE_OSX_SYSROOT": "/abc/sysroot",
"CMAKE_SHARED_LINKER_FLAGS_INIT": " ".join(inputs[0]),
"CMAKE_SYSROOT": "/abc/sysroot",
}
Expand Down Expand Up @@ -753,6 +754,7 @@ __var_CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN="cc-toolchain"
__var_CMAKE_C_FLAGS_INIT="-cc-flag -gcc_toolchain cc-toolchain --from-env --additional-flag"
__var_CMAKE_EXE_LINKER_FLAGS_INIT="executable"
__var_CMAKE_MODULE_LINKER_FLAGS_INIT="shared1 shared2"
__var_CMAKE_OSX_SYSROOT="/abc/sysroot"
__var_CMAKE_SHARED_LINKER_FLAGS_INIT="shared1 shared2"
__var_CMAKE_SYSROOT="/abc/sysroot"
cat > crosstool_bazel.cmake << EOF
Expand All @@ -767,6 +769,7 @@ set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "$$__var_CMAKE_C_COMPILER_EXTERNAL_TOOLC
set(CMAKE_C_FLAGS_INIT "$$__var_CMAKE_C_FLAGS_INIT$$")
set(CMAKE_EXE_LINKER_FLAGS_INIT "$$__var_CMAKE_EXE_LINKER_FLAGS_INIT$$")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "$$__var_CMAKE_MODULE_LINKER_FLAGS_INIT$$")
set(CMAKE_OSX_SYSROOT "$$__var_CMAKE_OSX_SYSROOT$$")
set(CMAKE_SHARED_LINKER_FLAGS_INIT "$$__var_CMAKE_SHARED_LINKER_FLAGS_INIT$$")
set(CMAKE_SYSROOT "$$__var_CMAKE_SYSROOT$$")
EOF
Expand Down