Skip to content

Commit

Permalink
Stop un-exporting environment variables
Browse files Browse the repository at this point in the history
No longer needed since we now filter out all environment variables for `bazel build`.

Signed-off-by: Brentley Jones <[email protected]>
  • Loading branch information
brentleyjones committed Aug 20, 2024
1 parent 1588079 commit 5153fb1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@

set -euo pipefail

# Reset tool overrides, so `bazel` sees the correct version. This is needed
# for rules_swift_package_manager to work correctly. We do this here as well as
# in `BazelDependencies` build settings, because we need the overrides at the
# target level, so we can't unset any target build settings, and we don't want
# to do it only in `bazel_build.sh`, because we want pre/post-build scripts to
# get the reset in `BazelDependencies`.
export CC=
export CXX=
export LD=
export LDPLUSPLUS=
export LIBTOOL=libtool
export SWIFT_EXEC=swiftc
export TAPI_EXEC=

cd "$SRCROOT"

readonly config="${BAZEL_CONFIG}_indexbuild"
Expand Down
6 changes: 0 additions & 6 deletions xcodeproj/internal/templates/bazel_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
output_groups_flag="--output_groups=$(IFS=, ; echo "${output_groups[*]}")"
readonly output_groups_flag

# Un-export Xcode set environment variables that mess up Bazel rules. If a user
# wants these values to be set for their build, they need to use
# `xcodeproj.bazel_env`.
export -n LD_LIBRARY_PATH
export -n SDKROOT

# Set `output_base`

# In `runner.sh` the generator has the build output base set inside of the outer
Expand Down

0 comments on commit 5153fb1

Please sign in to comment.