mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-80958 Fix merge conflict in unfiltered_compile_flags

This commit is contained in:
Zack Winter 2023-09-11 18:47:52 +00:00 committed by Evergreen Agent
parent 40b4e5d770
commit 20d93c496a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bazel/toolchains/mongo_toolchain.BUILD
View File

@ -52,11 +52,6 @@ filegroup(
"-Bexternal/mongo_toolchain/v4/lib",
"-Bexternal/mongo_toolchain/stow/gcc-v4/libexec/gcc/aarch64-mongodb-linux/11.3.0",
],
unfiltered_compile_flags = [
# Do not resolve our symlinked resource prefixes to real paths. This is required to
# make includes resolve correctly.
"-no-canonical-prefixes",
],
compiler = compiler_name,
cpu = "arm64",
cxx_builtin_include_directories = [
@ -68,6 +63,9 @@ filegroup(
"%package(@mongo_toolchain//stow/gcc-v4/lib/gcc/aarch64-mongodb-linux/11.3.0/include-fixed)%",
],
unfiltered_compile_flags = [
# Do not resolve our symlinked resource prefixes to real paths. This is required to
# make includes resolve correctly.
"-no-canonical-prefixes",
# Replace compile timestamp-related macros for reproducible binaries with consistent hashes.
"-Wno-builtin-macro-redefined",
"-D__DATE__=\"OMITTED_FOR_HASH_CONSISTENCY\"",