From 1b6c3aed6336efd056f5e3e0165e3e74f04b169f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 7 Sep 2023 04:31:26 +0300 Subject: tests.cc-wrapper: show more prominently what cc is being tested Show what libc is used, otherwise there's indication what libc is being used. Ex in gccMultiStdenv. --- pkgs/test/cc-wrapper/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/test/cc-wrapper') diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 43e8e7a214268..7d38ae31cf73d 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -9,10 +9,14 @@ let ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; emulator = stdenv.hostPlatform.emulator buildPackages; + libcxxStdenvSuffix = lib.optionalString (stdenv.cc.libcxx != null) "-libcxx"; in stdenv.mkDerivation { - name = "cc-wrapper-test"; + pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; + version = stdenv.cc.version; buildCommand = '' + echo "Testing: ${stdenv.cc.name}" >&2 + echo "With libc: ${stdenv.cc.libc.name}" >&2 set -o pipefail NIX_DEBUG=1 $CC -v -- cgit 1.4.1