From 5738a841e731f38458783a0964e0bda3e674fcea Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@altlinux.org>
Date: Sun, 10 Jan 2021 15:41:15 +0300
Subject: [PATCH] ALT: Do not use -no-canonical-prefixes clang option

Signed-off-by: Alexey Gladkov <legion@altlinux.org>
---
 build/config/compiler/BUILD.gn | 7 -------
 third_party/woff2/Makefile     | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index d7073ad38f0..8539b879e16 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1247,27 +1247,20 @@ config("compiler_deterministic") {
         # if the pdb contains source-level debug information and if linker
         # reproducibility is not critical.
         ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
       } else {
         # Use a fake fixed base directory for paths in the pdb to make the pdb
         # output fully deterministic and independent of the build directory.
         ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
       }
     }
   }
-
-  # Tells the compiler not to use absolute paths when passing the default
-  # paths to the tools it invokes. We don't want this because we don't
-  # really need it and it can mess up the goma cache entries.
-  if (is_clang && !is_nacl) {
-    cflags += [ "-no-canonical-prefixes" ]
-  }
 }
 
 config("clang_revision") {
   if (is_clang && clang_base_path == default_clang_base_path) {
     update_args = [
       "--print-revision",
       "--verify-version=$clang_version",
     ]
     if (llvm_force_head_revision) {
       update_args += [ "--llvm-force-head-revision" ]
diff --git a/third_party/woff2/Makefile b/third_party/woff2/Makefile
index fbb945c8e78..f8ab8b3f98b 100644
--- a/third_party/woff2/Makefile
+++ b/third_party/woff2/Makefile
@@ -1,20 +1,20 @@
 OS := $(shell uname)
 
 CPPFLAGS = -I./brotli/c/include/ -I./src -I./include
 
 AR ?= ar
 CC ?= gcc
 CXX ?= g++
 
 # It's helpful to be able to turn these off for fuzzing
-CANONICAL_PREFIXES ?= -no-canonical-prefixes
+CANONICAL_PREFIXES =
 NOISY_LOGGING ?= -DFONT_COMPRESSION_BIN
 COMMON_FLAGS = -fno-omit-frame-pointer $(CANONICAL_PREFIXES) $(NOISY_LOGGING) -D __STDC_FORMAT_MACROS
 
 ARFLAGS = crf
 
 ifeq ($(OS), Darwin)
   CPPFLAGS += -DOS_MACOSX
   ARFLAGS = cr
 else
   COMMON_FLAGS += -fno-tree-vrp
-- 
2.25.4