Merge "Set MAKEFLAGS=-j and GTEST_BRIEF in .envrc" into main

This commit is contained in:
rebecca “wiggles” turner 2024-03-29 17:09:13 +00:00 committed by Gerrit Code Review
commit 9d97d1cb68
2 changed files with 8 additions and 0 deletions

6
.envrc
View file

@ -1,3 +1,9 @@
# shellcheck shell=bash # shellcheck shell=bash
source_env_if_exists .envrc.local source_env_if_exists .envrc.local
# TODO: `use flake .#native-clangStdenvPackages` on macOS?
use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}" use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}"
export MAKEFLAGS="$MAKEFLAGS -e"
if [[ -n "$NIX_BUILD_CORES" ]]; then
export MAKEFLAGS="$MAKEFLAGS -j $NIX_BUILD_CORES"
fi
export GTEST_BRIEF=1

2
.gitignore vendored
View file

@ -157,3 +157,5 @@ result-*
# ClangBuildAnalyzer output, see maintainers/buildtime_report.sh # ClangBuildAnalyzer output, see maintainers/buildtime_report.sh
buildtime.bin buildtime.bin
.envrc.local