From fddd605d5cf1296d9e473142b2f3ae00d6894597 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 4 Apr 2020 12:26:06 +0530 Subject: [PATCH] Skip libcxx for Genode --- overlay/llvm-10/default.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/overlay/llvm-10/default.nix b/overlay/llvm-10/default.nix index 8011718..b24ea5d 100644 --- a/overlay/llvm-10/default.nix +++ b/overlay/llvm-10/default.nix @@ -186,16 +186,22 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { - stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; - })); + libcxx = if stdenv.targetPlatform.isGenode then + null + else + callPackage ./libc++ ({ } + // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); - libcxxabi = callPackage ./libc++abi.nix ({} // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { - stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; - libunwind = libraries.libunwind; - })); + libcxxabi = if stdenv.targetPlatform.isGenode then + null + else + callPackage ./libc++abi.nix ({ } + // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); openmp = callPackage ./openmp.nix {};