From 408c620f27fbee06ff09c03d5aeec74691c22665 Mon Sep 17 00:00:00 2001 From: Fredy Wijaya Date: Thu, 18 Jan 2024 11:04:32 -0600 Subject: [PATCH] devcontainer: Use libc++ when building Envoy (#31872) Fixes #31856 Signed-off-by: Fredy Wijaya Signed-off-by: Ryan Northey --- .devcontainer/Dockerfile | 2 +- .devcontainer/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 55423476d7e4..f5687d40bd6d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ ARG USER_UID=501 ARG USER_GID=$USER_UID ENV BUILD_DIR=/build -ENV ENVOY_STDLIB=libstdc++ +ENV ENVOY_STDLIB=libc++ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -y update \ diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index b50bb1190d66..421db0f0b61a 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -5,7 +5,7 @@ BAZELRC_FILE=~/.bazelrc bazel/setup_clang.sh /opt/llvm # TODO(phlax): use user.bazelrc # Use generated toolchain config because we know the base container is the one we're using in RBE. # Not using libc++ here because clangd will raise some tidy issue in libc++ header as of version 9. -echo "build --config=rbe-toolchain-clang" >> ~/.bazelrc +echo "build --config=rbe-toolchain-clang-libc++" >> ~/.bazelrc echo "build ${BAZEL_BUILD_EXTRA_OPTIONS}" | tee -a ~/.bazelrc # Ideally we want this line so bazel doesn't pollute things outside of the devcontainer, but some of