From 55cb636d133cbfcb12a13da906cf14c69172b98f Mon Sep 17 00:00:00 2001 From: htuch Date: Fri, 17 Aug 2018 09:50:01 -0400 Subject: [PATCH] [envoy] copy sources directly to $OUT. (#1724) Turns out we need to be in out/proc/self/cwd, not out/src/proc/self/cwd. In #1721, I was picking up stale artifacts from manual CLI rsync. Signed-off-by: Harvey Tuch --- projects/envoy/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/envoy/build.sh b/projects/envoy/build.sh index e2f7f913d..1af45ba63 100755 --- a/projects/envoy/build.sh +++ b/projects/envoy/build.sh @@ -73,9 +73,10 @@ bazel build --verbose_failures --dynamic_mode=off --spawn_strategy=standalone \ # also remap everything under proc/self/cwd to correspond to Bazel build paths. if [ "$SANITIZER" = "profile" ] then - # The build invoker expects to pickup the root of source in $SRC, we need this - # to look like proc/self/cwd. - declare -r REMAP_PATH="${SRC}/proc/self/cwd" + # The build invoker looks for sources in $SRC, but it turns out that we need + # to not be buried under src/, paths are expected at out/proc/self/cwd by + # the profiler. + declare -r REMAP_PATH="${OUT}/proc/self/cwd" mkdir -p "${REMAP_PATH}" # For .cc, we only really care about source/ today. rsync -av "${SRC}"/envoy/source "${REMAP_PATH}"