From fe48e211da79af767d87a8b7559995907b11de23 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:45:14 +0300 Subject: [PATCH] tests.cc-wrapper: Run with an empty path Ensure our wrappers hardcode all the necessary tools --- pkgs/test/cc-wrapper/default.nix | 67 ++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 3de359d15b4a7..dfa24dcc08ae7 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -11,6 +11,11 @@ let emulator = stdenv.hostPlatform.emulator buildPackages; isCxx = stdenv.cc.libcxx != null; libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; + mkdir = lib.getExe' stdenv.cc.coreutils_bin "mkdir"; + cp = lib.getExe' stdenv.cc.coreutils_bin "cp"; + touch = lib.getExe' stdenv.cc.coreutils_bin "touch"; + CC = lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"; + CXX = lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}c++"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -20,38 +25,40 @@ in stdenv.mkDerivation { echo "With libc: ${stdenv.cc.libc.name}" >&2 set -o pipefail - NIX_DEBUG=1 $CC -v - NIX_DEBUG=1 $CXX -v + unset PATH + + NIX_DEBUG=1 ${CC} -v + NIX_DEBUG=1 ${CXX} -v echo "checking whether compiler builds valid C binaries... " >&2 - $CC -o cc-check ${./cc-main.c} + ${CC} -o cc-check ${./cc-main.c} ${emulator} ./cc-check echo "checking whether compiler builds valid C++ binaries... " >&2 - $CXX -o cxx-check ${./cxx-main.cc} + ${CXX} -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found # in libcxxStdenv echo "checking whether cxxabi.h can be included... " >&2 - $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${CXX} -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi # cxx doesn't have libatomic.so ${lib.optionalString (!isCxx) '' # https://github.com/NixOS/nixpkgs/issues/91285 echo "checking whether libatomic.so can be linked... " >&2 - $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + ${CXX} -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 ''} # Test that linking libc++ works, and statically. ${lib.optionalString isCxx '' echo "checking whether can link with libc++... " >&2 - NIX_DEBUG=1 $CXX ${./cxx-main.cc} -c -o cxx-main.o - NIX_DEBUG=1 $CC cxx-main.o -lc++ -o cxx-main - NIX_DEBUG=1 $CC cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static + NIX_DEBUG=1 ${CXX} ${./cxx-main.cc} -c -o cxx-main.o + NIX_DEBUG=1 ${CC} cxx-main.o -lc++ -o cxx-main + NIX_DEBUG=1 ${CC} cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static ${emulator} ./cxx-main ${emulator} ./cxx-main-static rm cxx-main{,-static,.o} @@ -59,19 +66,19 @@ in stdenv.mkDerivation { ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 - mkdir -p foo/lib - $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} + ${mkdir} -p foo/lib + ${CC} -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} ${emulator} ./core-foundation-check ''} ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ${CC} ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' echo "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ${CC} ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ${emulator} ./cc-static-pie ''} ''} @@ -80,55 +87,55 @@ in stdenv.mkDerivation { # `gcc` does not support this so we gate the test on `clang` lib.optionalString stdenv.cc.isClang '' echo "checking whether cc-wrapper accepts -- followed by positional (file) args..." >&2 - mkdir -p positional + ${mkdir} -p positional # Make sure `--` is not parsed as a "non flag arg"; we should get an # input file error here and *not* a linker error. - { ! $CC --; } |& grep -q "no input files" + { ! ${CC} --; } |& grep -q "no input files" # And that positional file args _must_ be files (this is just testing # that we remembered to put the `--` back in the args to the compiler): - { ! $CC -c -- -o foo ${./foo.c}; } \ + { ! ${CC} -c -- -o foo ${./foo.c}; } \ |& grep -q "no such file or directory: '-o'" # Now check that we accept single and multiple positional file args: - $CC -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} - $CC -o positional/main -- positional/foo.o ${./ldflags-main.c} + ${CC} -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} + ${CC} -o positional/main -- positional/foo.o ${./ldflags-main.c} ${emulator} ./positional/main ''} echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 - mkdir -p foo/include - cp ${./foo.c} foo/include/foo.h - NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c} + ${mkdir} -p foo/include + ${cp} ${./foo.c} foo/include/foo.h + NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" ${CC} -o cflags-check ${./cflags-main.c} ${emulator} ./cflags-check echo "checking whether compiler uses NIX_LDFLAGS... " >&2 - mkdir -p foo/lib - $CC -shared \ + ${mkdir} -p foo/lib + ${CC} -shared \ ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} - NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" ${CC} -lfoo -o ldflags-check ${./ldflags-main.c} ${emulator} ./ldflags-check echo "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2 - mkdir -p std-include - cp ${./stdio.h} std-include/stdio.h - NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} + ${mkdir} -p std-include + ${cp} ${./stdio.h} std-include/stdio.h + NIX_DEBUG=1 ${CC} -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} ${emulator} ./nostdinc-main - $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} + ${CXX} -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ${emulator} ./nostdinc-main++ ${lib.optionalString sanitizersWorking '' echo "checking whether sanitizers are fully functional... ">&2 - $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ${CC} -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} - touch $out + ${touch} $out ''; meta.platforms = lib.platforms.all;