fix: missing flags to work on RBE (#47)

Signed-off-by: Thulio Ferraz Assis <[email protected]>
f0rmiga · Jun 21, 2022 · efc23c5 · efc23c5
1 parent b15575d
commit efc23c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/sysroot/flags.bzl b/sysroot/flags.bzl
@@ -8,12 +8,14 @@ ARCH_AARCH64 = "aarch64"
 cflags = [
     "-fdiagnostics-color=always",
     "-nostdinc",
+    "-B%workspace%/bin",
 ]
 
 cxxflags = [
     "-fdiagnostics-color=always",
     "-nostdinc",
     "-nostdinc++",
+    "-B%workspace%/bin",
 ]
 
 # buildifier: disable=function-docstring
@@ -33,6 +35,7 @@ def ldflags(arch, gcc_version):
     else:
         fail("unknown arch")
     return [
+        "-B%workspace%/bin",
         "-B%sysroot%/usr/lib",
         "-B%sysroot%/{arch_specific_prefix}{lib}".format(
             arch_specific_prefix = arch_specific_prefix,

diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl
@@ -50,8 +50,8 @@ def _gcc_toolchain_impl(rctx):
         cxx_builtin_include_directories = str(cxx_builtin_include_directories),
 
         # Flags
-        extra_cflags = str(rctx.attr.extra_cflags),
-        extra_cxxflags = str(rctx.attr.extra_cxxflags),
+        extra_cflags = _format_flags(sysroot, toolchain_root, rctx.attr.extra_cflags),
+        extra_cxxflags = _format_flags(sysroot, toolchain_root, rctx.attr.extra_cxxflags),
         extra_ldflags = _format_flags(sysroot, toolchain_root, rctx.attr.extra_ldflags),
         includes = str(includes),
     ))