build: remove cc_configure and cc_wrapper

.bazelrc

@@ -8,8 +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
+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
@@ -60,6 +64,8 @@ build:clang-msan --copt -fsanitize-memory-track-origins=2
 build:libc++ --action_env=CC
 build:libc++ --action_env=CXX
 build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
+build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
+build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a:-lm
 build:libc++ --action_env=PATH
 build:libc++ --host_linkopt=-fuse-ld=lld
 build:libc++ --define force_libcpp=enabled

WORKSPACE

@@ -5,16 +5,13 @@ load("//bazel:api_repositories.bzl", "envoy_api_dependencies")
 envoy_api_dependencies()
 
 load("//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")
-load("//bazel:cc_configure.bzl", "cc_configure")
 
 envoy_dependencies()
 
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 
 rules_foreign_cc_dependencies()
 
-cc_configure()
-
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()

bazel/BUILD

@@ -85,6 +85,20 @@ config_setting(
     values = {"define": "ENVOY_CONFIG_COVERAGE=1"},
 )
 
+config_setting(
+    name = "clang_build",
+    flag_values = {
+        "@bazel_tools//tools/cpp:compiler": "clang",
+    },
+)
+
+config_setting(
+    name = "gcc_build",
+    flag_values = {
+        "@bazel_tools//tools/cpp:compiler": "gcc",
+    },
+)
+
 config_setting(
     name = "disable_tcmalloc",
     values = {"define": "tcmalloc=disabled"},

bazel/envoy_binary.bzl

@@ -4,7 +4,6 @@ load(
     ":envoy_internal.bzl",
     "envoy_copts",
     "envoy_external_dep_path",
-    "envoy_static_link_libstdcpp_linkopts",
     "tcmalloc_external_dep",
 )
 
@@ -50,25 +49,24 @@ def _envoy_select_exported_symbols(xs):
 # Compute the final linkopts based on various options.
 def _envoy_linkopts():
     return select({
-               # The macOS system library transitively links common libraries (e.g., pthread).
-               "@envoy//bazel:apple": [
-                   # See note here: https://luajit.org/install.html
-                   "-pagezero_size 10000",
-                   "-image_base 100000000",
-               ],
-               "@envoy//bazel:windows_x86_64": [
-                   "-DEFAULTLIB:advapi32.lib",
-                   "-DEFAULTLIB:ws2_32.lib",
-                   "-WX",
-               ],
-               "//conditions:default": [
-                   "-pthread",
-                   "-lrt",
-                   "-ldl",
-                   "-Wl,--hash-style=gnu",
-               ],
-           }) + envoy_static_link_libstdcpp_linkopts() + \
-           _envoy_select_exported_symbols(["-Wl,-E"])
+        # The macOS system library transitively links common libraries (e.g., pthread).
+        "@envoy//bazel:apple": [
+            # See note here: https://luajit.org/install.html
+            "-pagezero_size 10000",
+            "-image_base 100000000",
+        ],
+        "@envoy//bazel:windows_x86_64": [
+            "-DEFAULTLIB:advapi32.lib",
+            "-DEFAULTLIB:ws2_32.lib",
+            "-WX",
+        ],
+        "//conditions:default": [
+            "-pthread",
+            "-lrt",
+            "-ldl",
+            "-Wl,--hash-style=gnu",
+        ],
+    }) + _envoy_select_exported_symbols(["-Wl,-E"])
 
 def _envoy_stamped_deps():
     return select({

bazel/envoy_internal.bzl

@@ -40,6 +40,10 @@ def envoy_copts(repository, test = False):
                repository + "//bazel:windows_opt_build": [],
                repository + "//bazel:windows_fastbuild_build": [],
                repository + "//bazel:windows_dbg_build": [],
+           }) + select({
+               repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand"],
+               repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"],
+               "//conditions:default": [],
            }) + select({
                repository + "//bazel:disable_tcmalloc": ["-DABSL_MALLOC_HOOK_MMAP_DISABLE"],
                "//conditions:default": ["-DTCMALLOC"],
@@ -82,12 +86,6 @@ def envoy_select_force_libcpp(if_libcpp, default = None):
         "//conditions:default": default or [],
     })
 
-def envoy_static_link_libstdcpp_linkopts():
-    return envoy_select_force_libcpp(
-        ["-stdlib=libc++", "-l:libc++.a", "-l:libc++abi.a", "-static-libgcc"],
-        ["-static-libstdc++", "-static-libgcc"],
-    )
-
 # Dependencies on tcmalloc_and_profiler should be wrapped with this function.
 def tcmalloc_external_dep(repository):
     return select({

bazel/envoy_test.bzl

@@ -8,7 +8,6 @@ load(
     "envoy_external_dep_path",
     "envoy_linkstatic",
     "envoy_select_force_libcpp",
-    "envoy_static_link_libstdcpp_linkopts",
     "tcmalloc_external_dep",
 )
 
@@ -205,7 +204,7 @@ def envoy_cc_test_binary(
     envoy_cc_binary(
         name,
         testonly = 1,
-        linkopts = _envoy_test_linkopts() + envoy_static_link_libstdcpp_linkopts(),
+        linkopts = _envoy_test_linkopts(),
         **kargs
     )
 

bazel/repositories.bzl

@@ -2,12 +2,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(":genrule_repository.bzl", "genrule_repository")
 load("@envoy_api//bazel:envoy_http_archive.bzl", "envoy_http_archive")
 load(":repository_locations.bzl", "REPOSITORY_LOCATIONS")
-load(
-    "@bazel_tools//tools/cpp:windows_cc_configure.bzl",
-    "find_vc_path",
-    "setup_vc_env_vars",
-)
-load("@bazel_tools//tools/cpp:lib_cc_configure.bzl", "get_env_var")
 load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
 
 # dict of {build recipe name: longform extension name,}

ci/WORKSPACE.filter.example

@@ -9,16 +9,13 @@ load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
 envoy_api_dependencies()
 
 load("@envoy//bazel:repositories.bzl", "envoy_dependencies", "GO_VERSION")
-load("@envoy//bazel:cc_configure.bzl", "cc_configure")
 
 envoy_dependencies()
 
 # TODO(htuch): Roll this into envoy_dependencies()
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 rules_foreign_cc_dependencies()
 
-cc_configure()
-
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 go_rules_dependencies()
 go_register_toolchains(go_version = GO_VERSION)