From 8c335c47c08f78befe8f5eb0e6364e850b26d017 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 4 Jun 2024 08:37:28 +0300 Subject: gnu: ldc: Fix build on aarch64-linux. * gnu/packages/dlang.scm (ldc)[arguments]: Don't delete tests which don't fail on aarch64-linux. Adjust custom 'check phase to skip some tests known to fail on aarch64-linux. Change-Id: I84ea2f356a44e12952dbb852e41921895605176a --- gnu/packages/dlang.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 9dd78943db..dc9d0cde37 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -316,12 +316,6 @@ (define (gnu-triplet->clang-arch system) "sanitizers/msan_noerror.d" "sanitizers/msan_uninitialized.d" "dmd/runnable_cxx/cppa.d"))) - (,(target-aarch64?) - (for-each delete-file - '("dmd/runnable/ldc_cabi1.d" - "sanitizers/fuzz_basic.d" - "sanitizers/msan_noerror.d" - "sanitizers/msan_uninitialized.d"))) (#t '()))))) (add-before 'configure 'set-cc-and-cxx-to-use-clang ;; The tests require to be built with Clang; build everything @@ -352,8 +346,17 @@ (define (gnu-triplet->clang-arch system) "-R" "dmd-testsuite") (display "running the defaultlib unit tests and druntime \ integration tests...\n") - (invoke "ctest" "--output-on-failure" "-j" job-count - "-E" "dmd-testsuite|lit-tests|ldc2-unittest"))))))))) + (invoke + "ctest" "--output-on-failure" "-j" job-count "-E" + (string-append + "dmd-testsuite|lit-tests|ldc2-unittest" + ,@(if (target-aarch64?) + `((string-append + "|std.internal.math.gammafunction-shared" + "|std.math.exponential-shared" + "|std.internal.math.gammafunction-debug-shared" + "|druntime-test-exceptions-debug")) + `("")))))))))))) (native-inputs (append (delete "llvm" (alist-replace "ldc" (list ldc-bootstrap) -- cgit v1.2.3