From b2ac19e79087d34f94b565d3e7a8a9585e026e92 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 31 Jan 2019 15:42:37 +0100 Subject: [PATCH] Pass through the os_name() from a custom shell toolchain to CMake (#215) --- tools/build_defs/cmake_script.bzl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build_defs/cmake_script.bzl b/tools/build_defs/cmake_script.bzl index 7baf4273..63f0f661 100644 --- a/tools/build_defs/cmake_script.bzl +++ b/tools/build_defs/cmake_script.bzl @@ -178,11 +178,13 @@ def _move_dict_values(target, source, descriptor_map): target[existing.value] = target[existing.value] + " " + value def _fill_crossfile_from_toolchain(workspace_name, target_os, tools, flags): - os_name = "Linux" + os_name = target_os if target_os == "windows": os_name = "Windows" if target_os == "osx": os_name = "Apple" + if target_os == "linux": + os_name = "Linux" dict = { "CMAKE_SYSTEM_NAME": os_name, }