mirror of
https://github.com/bazel-contrib/rules_foreign_cc
synced 2024-11-28 08:43:26 +00:00
removes strip calls from string concatenation to fix bug where compiler invocation failed due to invalid syntax (#163)
This commit is contained in:
parent
7fdfc7cade
commit
6caaa8a26b
|
@ -173,10 +173,7 @@ def _move_dict_values(target, source, descriptor_map):
|
||||||
if existing.replace or target.get(existing.value) == None:
|
if existing.replace or target.get(existing.value) == None:
|
||||||
target[existing.value] = value
|
target[existing.value] = value
|
||||||
else:
|
else:
|
||||||
target[existing.value] = _merge(target[existing.value], value)
|
target[existing.value] = target[existing.value] + " " + value
|
||||||
|
|
||||||
def _merge(str1, str2):
|
|
||||||
return str1.strip("\"'") + " " + str2.strip("\"'")
|
|
||||||
|
|
||||||
def _fill_crossfile_from_toolchain(workspace_name, target_os, tools, flags):
|
def _fill_crossfile_from_toolchain(workspace_name, target_os, tools, flags):
|
||||||
os_name = "Linux"
|
os_name = "Linux"
|
||||||
|
|
Loading…
Reference in a new issue