From 88622f3996923ab4ef02b81ea73e6f616a7132d7 Mon Sep 17 00:00:00 2001
From: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
Date: Wed, 15 Jun 2022 11:31:18 -0700
Subject: [PATCH] bump: sysroots (#45)

* bump: sysroots

Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>

* fix: flags

Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
---
 sysroot/flags.bzl                 | 43 ++++++++++++++-----------------
 toolchain/cc_toolchain_config.bzl | 17 ++++++++++++
 toolchain/defs.bzl                | 12 ++++-----
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/sysroot/flags.bzl b/sysroot/flags.bzl
index 1fee34b..9bfba44 100644
--- a/sysroot/flags.bzl
+++ b/sysroot/flags.bzl
@@ -8,35 +8,32 @@ ARCH_AARCH64 = "aarch64"
 cflags = [
     "-fdiagnostics-color=always",
     "-nostdinc",
-    "-B{toolchain_root}/bin",
 ]
 
 cxxflags = [
     "-fdiagnostics-color=always",
     "-nostdinc",
     "-nostdinc++",
-    "-B{toolchain_root}/bin",
 ]
 
 # buildifier: disable=function-docstring
 def ldflags(arch, gcc_version):
     if arch == ARCH_X86_64:
         lib = "lib64"
-        target_triplet = "x86_64-linux-gnu"
+        target = "x86_64-linux"
         arch_specific_prefix = ""
     elif arch == ARCH_ARMV7:
         lib = "lib"
-        target_triplet = "arm-linux-gnueabihf"
-        arch_specific_prefix = target_triplet + "/"
+        target = "arm-linux-gnueabihf"
+        arch_specific_prefix = target + "/"
     elif arch == ARCH_AARCH64:
         lib = "lib64"
-        target_triplet = "aarch64-linux-gnu"
-        arch_specific_prefix = ""
+        target = "aarch64-linux"
+        arch_specific_prefix = target + "/"
     else:
         fail("unknown arch")
     return [
-        "-B{toolchain_root}/bin",
-        "-B%sysroot%/usr/{lib}".format(lib = lib),
+        "-B%sysroot%/usr/lib",
         "-B%sysroot%/{arch_specific_prefix}{lib}".format(
             arch_specific_prefix = arch_specific_prefix,
             lib = lib
@@ -45,24 +42,24 @@ def ldflags(arch, gcc_version):
             arch_specific_prefix = arch_specific_prefix,
             lib = lib
         ),
-        "-L%sysroot%/usr/{lib}".format(lib = lib),
-        "-L%sysroot%/lib/gcc/{target_triplet}/{gcc_version}".format(
+        "-L%sysroot%/usr/lib",
+        "-L%sysroot%/lib/gcc/{target}/{gcc_version}".format(
             gcc_version = gcc_version,
-            target_triplet = target_triplet,
+            target = target,
         ),
     ]
 
 # buildifier: disable=function-docstring
 def includes(arch, gcc_version):
     if arch == ARCH_X86_64:
-        target_triplet = "x86_64-linux-gnu"
+        target = "x86_64-linux"
         include_prefix = ""
     elif arch == ARCH_ARMV7:
-        target_triplet = "arm-linux-gnueabihf"
-        include_prefix = target_triplet + "/"
+        target = "arm-linux-gnueabihf"
+        include_prefix = target + "/"
     elif arch == ARCH_AARCH64:
-        target_triplet = "aarch64-linux-gnu"
-        include_prefix = ""
+        target = "aarch64-linux"
+        include_prefix = target + "/"
     else:
         fail("unknown arch")
     return [
@@ -70,18 +67,18 @@ def includes(arch, gcc_version):
             gcc_version = gcc_version,
             include_prefix = include_prefix,
         ),
-        "%sysroot%/{include_prefix}include/c++/{gcc_version}/{target_triplet}".format(
+        "%sysroot%/{include_prefix}include/c++/{gcc_version}/{target}".format(
             gcc_version = gcc_version,
             include_prefix = include_prefix,
-            target_triplet = target_triplet,
+            target = target,
         ),
-        "%sysroot%/lib/gcc/{target_triplet}/{gcc_version}/include-fixed".format(
+        "%sysroot%/lib/gcc/{target}/{gcc_version}/include-fixed".format(
             gcc_version = gcc_version,
-            target_triplet = target_triplet,
+            target = target,
         ),
-        "%sysroot%/lib/gcc/{target_triplet}/{gcc_version}/include".format(
+        "%sysroot%/lib/gcc/{target}/{gcc_version}/include".format(
             gcc_version = gcc_version,
-            target_triplet = target_triplet,
+            target = target,
         ),
         "%sysroot%/usr/include",
     ]
diff --git a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl
index 2fdd15b..ac15d98 100644
--- a/toolchain/cc_toolchain_config.bzl
+++ b/toolchain/cc_toolchain_config.bzl
@@ -152,6 +152,22 @@ def _impl(ctx):
                             "-no-canonical-prefixes",
                             "-fno-canonical-system-headers",
                             "-Wno-builtin-macro-redefined",
+                        ],
+                    ),
+                ],
+            ),
+        ],
+    )
+
+    redacted_dates_feature = feature(
+        name = "redacted_dates",
+        enabled = True,
+        flag_sets = [
+            flag_set(
+                actions = all_compile_actions,
+                flag_groups = [
+                    flag_group(
+                        flags = [
                             "-D__DATE__=\"redacted\"",
                             "-D__TIMESTAMP__=\"redacted\"",
                             "-D__TIME__=\"redacted\"",
@@ -455,6 +471,7 @@ def _impl(ctx):
         user_compile_flags_feature,
         sysroot_feature,
         unfiltered_compile_flags_feature,
+        redacted_dates_feature,
         extra_cflags_feature,
         extra_cxxflags_feature,
         extra_ldflags_feature,
diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl
index 5468695..33d9534 100644
--- a/toolchain/defs.bzl
+++ b/toolchain/defs.bzl
@@ -273,16 +273,16 @@ ARCHS = struct(
 
 _SYSROOTS = {
     "aarch64": struct(
-        sha256 = "8ccddd7ca9cd188fbfb06bf29fc5dccc213e5b80591f44e3f84c38e5ad0bb419",
-        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.1.0/sysroot-aarch64.tar.xz",
+        sha256 = "11e01ece0de5265be7446ab6de55b3d75b6aa75d42acd1db057efe3db8cce7f9",
+        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.2.0/sysroot-aarch64.tar.xz",
     ),
     "armv7": struct(
-        sha256 = "a3941793e74fd21b1dfc067c7e96d4e6e246914f9050eaf44abb0ebc91121227",
-        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.1.0/sysroot-armv7.tar.xz",
+        sha256 = "14180244f06f6cdf98ec283dffaf333f21a91d5e3ddaebc71967d798d2a73bd3",
+        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.2.0/sysroot-armv7.tar.xz",
     ),
     "x86_64": struct(
-        sha256 = "a5b0f5515684b16fb564b935f4b7ee28feda8ded966e26be7c67db71c6148493",
-        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.1.0/sysroot-x86_64.tar.xz",
+        sha256 = "fc37e9dd5184093b6f92fc4e0a4b680dc144814d6225bc44daaf1b284311b0cc",
+        url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.2.0/sysroot-x86_64.tar.xz",
     ),
 }