From aeffc641e6e6e6be3bc69ed50b97b9a9a2ac3700 Mon Sep 17 00:00:00 2001
From: Lizan Zhou <lizan@tetrate.io>
Date: Fri, 12 Jul 2019 07:38:03 +0000
Subject: [PATCH] asan tweak

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
---
 .bazelrc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index bc3afe63b89d..771d01e27b3f 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -8,10 +8,12 @@ startup --host_jvm_args=-Xmx512m
 build --workspace_status_command=bazel/get_workspace_status
 build --experimental_remap_main_repo
 build --host_force_python=PY2
-build --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
-build --action_env=BAZEL_LINKOPTS=-static-libgcc
+build --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
+build --action_env=BAZEL_LINKOPTS=-lm:-static-libgcc
 
 # Basic ASAN/UBSAN that works for gcc
+build:asan --action_env=BAZEL_LINKLIBS=
+build:asan --action_env=BAZEL_LINKOPTS=-lstdc++:-lm
 build:asan --define ENVOY_CONFIG_ASAN=1
 build:asan --copt -fsanitize=address,undefined
 build:asan --linkopt -fsanitize=address,undefined