From f4313b7b2655822248cf389958052fa80a5d1d4c Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Fri, 13 Oct 2023 13:42:53 +0200 Subject: [PATCH] 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 first. Change-Id: I5bc6892f8c6353a626f5ca103805c9a0e9a0d494 Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1726 Reviewed-by: informatic --- env.sh | 2 +- shell.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/env.sh b/env.sh index 578bef1d..d9259f34 100644 --- a/env.sh +++ b/env.sh @@ -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 diff --git a/shell.nix b/shell.nix index 10dd95c1..1ef93010 100644 --- a/shell.nix +++ b/shell.nix @@ -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