Skip to content
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

Jump to bottom

Support building 32-bit C++ binaries on Windows with MSVC toolchain #11938

Closed
wants to merge 9 commits into from
Closed

Support building 32-bit C++ binaries on Windows with MSVC toolchain #11938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dba5946
Update windows_cc_configure.bzl
mai12 Aug 13, 2020
e85e5de
Support compiling 32-bit binaries
mai12 Aug 13, 2020
0ac3ed5
Support compiling 32-bit binaries
mai12 Aug 13, 2020
db4cb18
Support compiling 32-bit binaries
mai12 Aug 13, 2020
0b69021
Support 32-bit c++ windows toolchain
Aug 14, 2020
d8dafd7
Revert "Support 32-bit c++ windows toolchain"
Aug 14, 2020
b3103eb
Support 32-bit c++ windows toolchain
Aug 14, 2020
aa656e0
Updated to run vcvarsall.bat only once.
Aug 17, 2020
a128660
Refactoring and Adding Documentation
Aug 17, 2020
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
20 changes: 19 additions & 1 deletion src/test/py/bazel/bazel_windows_cpp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,25 @@ def testCcCompileWithTreeArtifactAsSource(self):
])
exit_code, _, stderr = self.RunBazel(['build', '//:main'])
self.AssertExitCode(exit_code, 0, stderr)


def testBuild32BitCppBinaryWithMsvcCL(self):
self.CreateWorkspaceWithDefaultRepos('WORKSPACE')
self.ScratchFile('BUILD', [
'cc_binary(',
' name = "main",',
' srcs = ["main.cc"],',
')',
])
self.ScratchFile('main.cc', [
'int main() {',
' return 0;',
'}',
])
exit_code, _, stderr = self.RunBazel([
'build', '-s', '--cpu=x64_x86_windows', '//:main'
])
self.AssertExitCode(exit_code, 0, stderr)
meteorcloudy marked this conversation as resolved.
Show resolved Hide resolved
self.assertIn('x86/cl.exe', ''.join(stderr))

if __name__ == '__main__':
unittest.main()
104 changes: 87 additions & 17 deletions tools/cpp/BUILD.windows.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ cc_toolchain_suite(
toolchains = {
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
"x64_windows|msvc-cl": ":cc-compiler-x64_windows",
"x64_x86_windows|msvc-cl": ":cc-compiler-x64_x86_windows",
coeuvre marked this conversation as resolved.
Show resolved Hide resolved
"x64_windows|msys-gcc": ":cc-compiler-x64_windows_msys",
"x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
"x64_windows|clang-cl": ":cc-compiler-x64_windows-clang-cl",
"x64_windows_msys": ":cc-compiler-x64_windows_msys",
"x64_windows": ":cc-compiler-x64_windows",
"x64_x86_windows": ":cc-compiler-x64_x86_windows",
"armeabi-v7a": ":cc-compiler-armeabi-v7a",
},
)
Expand Down Expand Up @@ -85,8 +87,8 @@ cc_toolchain_config(
cxx_builtin_include_directories = [%{cxx_builtin_include_directories}],
tool_paths = {%{tool_paths}},
tool_bin_path = "%{tool_bin_path}",
dbg_mode_debug_flag = "%{dbg_mode_debug_flag}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag}",
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x64}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x64}",
)

toolchain(
Expand Down Expand Up @@ -131,8 +133,8 @@ cc_toolchain_config(
tool_bin_path = "%{mingw_tool_bin_path}",
cxx_builtin_include_directories = [%{mingw_cxx_builtin_include_directories}],
tool_paths = {%{mingw_tool_paths}},
dbg_mode_debug_flag = "%{dbg_mode_debug_flag}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag}",
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x64}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x64}",
)

toolchain(
Expand Down Expand Up @@ -176,29 +178,30 @@ cc_toolchain_config(
abi_libc_version = "local",
toolchain_identifier = "msvc_x64",
msvc_env_tmp = "%{msvc_env_tmp}",
msvc_env_path = "%{msvc_env_path}",
msvc_env_path = "%{msvc_env_path_x64}",
msvc_env_include = "%{msvc_env_include}",
msvc_env_lib = "%{msvc_env_lib}",
msvc_cl_path = "%{msvc_cl_path}",
msvc_ml_path = "%{msvc_ml_path}",
msvc_link_path = "%{msvc_link_path}",
msvc_lib_path = "%{msvc_lib_path}",
msvc_env_lib = "%{msvc_env_lib_x64}",
msvc_cl_path = "%{msvc_cl_path_x64}",
msvc_ml_path = "%{msvc_ml_path_x64}",
msvc_link_path = "%{msvc_link_path_x64}",
msvc_lib_path = "%{msvc_lib_path_x64}",
cxx_builtin_include_directories = [%{msvc_cxx_builtin_include_directories}],
tool_paths = {
"ar": "%{msvc_lib_path}",
"ml": "%{msvc_ml_path}",
"cpp": "%{msvc_cl_path}",
"gcc": "%{msvc_cl_path}",
"ar": "%{msvc_lib_path_x64}",
"ml": "%{msvc_ml_path_x64}",
"cpp": "%{msvc_cl_path_x64}",
"gcc": "%{msvc_cl_path_x64}",
"gcov": "wrapper/bin/msvc_nop.bat",
"ld": "%{msvc_link_path}",
"ld": "%{msvc_link_path_x64}",
"nm": "wrapper/bin/msvc_nop.bat",
"objcopy": "wrapper/bin/msvc_nop.bat",
"objdump": "wrapper/bin/msvc_nop.bat",
"strip": "wrapper/bin/msvc_nop.bat",
},
archiver_flags = ["/MACHINE:X64"],
default_link_flags = ["/MACHINE:X64"],
dbg_mode_debug_flag = "%{dbg_mode_debug_flag}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag}",
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x64}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x64}",
)

toolchain(
Expand All @@ -215,6 +218,72 @@ toolchain(
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-x64_x86_windows",
toolchain_identifier = "msvc_x64_x86",
toolchain_config = ":msvc_x64_x86",
all_files = ":empty",
ar_files = ":empty",
as_files = ":msvc_compiler_files",
compiler_files = ":msvc_compiler_files",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
)

cc_toolchain_config(
name = "msvc_x64_x86",
cpu = "x64_windows",
compiler = "msvc-cl",
host_system_name = "local",
target_system_name = "local",
target_libc = "msvcrt",
abi_version = "local",
abi_libc_version = "local",
toolchain_identifier = "msvc_x64_x86",
msvc_env_tmp = "%{msvc_env_tmp}",
msvc_env_path = "%{msvc_env_path_x86}",
msvc_env_include = "%{msvc_env_include}",
msvc_env_lib = "%{msvc_env_lib_x86}",
msvc_cl_path = "%{msvc_cl_path_x86}",
msvc_ml_path = "%{msvc_ml_path_x86}",
msvc_link_path = "%{msvc_link_path_x86}",
msvc_lib_path = "%{msvc_lib_path_x86}",
cxx_builtin_include_directories = [%{msvc_cxx_builtin_include_directories}],
tool_paths = {
"ar": "%{msvc_lib_path_x86}",
"ml": "%{msvc_ml_path_x86}",
"cpp": "%{msvc_cl_path_x86}",
"gcc": "%{msvc_cl_path_x86}",
"gcov": "wrapper/bin/msvc_nop.bat",
"ld": "%{msvc_link_path_x86}",
"nm": "wrapper/bin/msvc_nop.bat",
"objcopy": "wrapper/bin/msvc_nop.bat",
"objdump": "wrapper/bin/msvc_nop.bat",
"strip": "wrapper/bin/msvc_nop.bat",
},
archiver_flags = ["/MACHINE:X86"],
default_link_flags = ["/MACHINE:X86"],
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x86}",
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x86}",
)

toolchain(
name = "cc-toolchain-x64_x86_windows",
exec_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
target_compatible_with = [
"@platforms//cpu:x86_32",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_x86_windows",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-x64_windows-clang-cl",
toolchain_identifier = "clang_cl_x64",
Expand Down Expand Up @@ -261,6 +330,7 @@ cc_toolchain_config(
"objdump": "wrapper/bin/msvc_nop.bat",
"strip": "wrapper/bin/msvc_nop.bat",
},
archiver_flags = ["/MACHINE:X64"],
default_link_flags = ["/MACHINE:X64", "/DEFAULTLIB:clang_rt.builtins-x86_64.lib"],
dbg_mode_debug_flag = "%{clang_cl_dbg_mode_debug_flag}",
fastbuild_mode_debug_flag = "%{clang_cl_fastbuild_mode_debug_flag}",
Expand Down
Loading