env.sh: do not set CC=clang in nix(os)

That seems to be broken:

  external/com_google_absl/absl/base/config.h:56:10: fatal error: 'cstddef' file not found

We should probably make it work some day, but let's unbreak things

Change-Id: I5bc6892f8c6353a626f5ca103805c9a0e9a0d494
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1726
Reviewed-by: informatic <informatic@hackerspace.pl>
q3k 2023-10-13 13:42:53 +02:00 committed by q3k
parent a5ba554446
commit f4313b7b26
2 changed files with 2 additions and 1 deletions

View File

@ -16,7 +16,7 @@ hscloud_path="$hscloud_root/bazel-bin/tools:$hscloud_root/bazel-bin/cluster/tool
unset -f hscloud_root
unset -f hscloud_path
if command -v clang &> /dev/null; then
if command -v clang &> /dev/null && [ -z $HSCLOUD_NIX ]; then
# if we have clang, use it
# avoids weird PATH issues with linkers, eg https://github.com/bazelbuild/bazel/issues/18834
export CC=clang

View File

@ -20,6 +20,7 @@ in with hscloud.pkgs; let
export NIX_SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
export FONTCONFIG_FILE="${fontconfig}"
export HSCLOUD_NIX=yes
source ${toString ./.}/env.sh