From a16c092ef4a5c9f1de21c6c57cf4b7bd53c231bf Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 22 Sep 2025 17:22:22 +0200 Subject: [PATCH] backport bazelrc change from main --- .bazelrc | 5 +++-- .gitignore | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index 76932a33d6..76afa1ad32 100644 --- a/.bazelrc +++ b/.bazelrc @@ -104,6 +104,7 @@ build:asan --copt -fno-omit-frame-pointer build:asan --linkopt -fsanitize=address ############################################################################### -# Put user-specific options in .bazelrc.user +# Put user-specific options in user.bazelrc +# See https://bazel.build/configure/best-practices#bazelrc-file ################################################################################ -try-import %workspace%/.bazelrc.user +try-import %workspace%/user.bazelrc diff --git a/.gitignore b/.gitignore index cb96e75443..2f91a2e217 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ export_meta ortools/bazel-* examples/bazel-* bazel-* +user.bazelrc .vagrant/