Skip to content

Commit

Permalink
avoid introducing new env vars
Browse files Browse the repository at this point in the history
Signed-off-by: David Korczynski <[email protected]>
  • Loading branch information
DavidKorczynski committed Nov 6, 2024
1 parent d03977e commit ceb69b9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions infra/base-images/base-builder/compile
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,6 @@ if [[ ! -z "${REPLAY_ENABLED-}" ]]; then
# If this is a replay, then use replay_build.sh. This is expected to be
# running in a cached container where a build has already happened prior.
BUILD_CMD="bash -eux $SRC/replay_build.sh"
elif [[ ! -z "${COMPILE_USING_CCACHE-}" ]]; then
# For ccache builds we run the regular build but with ccache compilers. For
# this to be successful, there needs to be a valid ccache in /ccache/cache
# and this is expected to be copied into the image/container prior to the
# compile script running.
# Using ccache expects a vanilla OSS-Fuzz project image (not a cached
# container).
export PATH=/ccache/bin:$PATH
BUILD_CMD="$SRC/build.sh"
else
BUILD_CMD="bash -eux $SRC/build.sh"
fi
Expand Down
2 changes: 1 addition & 1 deletion infra/experimental/chronos/prepare-ccache
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
PROJECT=$1
{
echo "COPY ccache-cache/ /ccache/cache";
echo "ENV COMPILE_USING_CCACHE=1"
echo "ENV PATH=/ccache/bin:$PATH"
} >> "projects/$PROJECT/Dockerfile"

0 comments on commit ceb69b9

Please sign in to comment.