diff --git a/overlay/llvm-8/clang/genode.patch b/overlay/llvm-8/clang/genode.patch
index a382eb8..6fbd4c7 100644
--- a/overlay/llvm-8/clang/genode.patch
+++ b/overlay/llvm-8/clang/genode.patch
@@ -121,10 +121,10 @@ index 1a46073aa..72b6f7389 100644
          StringRef S = A->getValue();
 diff --git a/lib/Driver/ToolChains/Genode.cpp b/lib/Driver/ToolChains/Genode.cpp
 new file mode 100644
-index 000000000..cf87b10ba
+index 000000000..488863cb4
 --- /dev/null
 +++ b/lib/Driver/ToolChains/Genode.cpp
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,147 @@
 +//===--- Genode.cpp - Genode ToolChain Implementations ----------*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -223,6 +223,8 @@ index 000000000..cf87b10ba
 +
 +  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 +
++  AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
++
 +  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs, options::OPT_noposix)) {
 +    CmdArgs.push_back("-lc");
 +    if (!Args.hasArg(options::OPT_shared)) {
diff --git a/overlay/llvm-8/default.nix b/overlay/llvm-8/default.nix
index 251e489..a0ec558 100644
--- a/overlay/llvm-8/default.nix
+++ b/overlay/llvm-8/default.nix
@@ -102,7 +102,7 @@ let
         targetLlvmLibraries.libcxx
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isGenode && !stdenv.targetPlatform.isWasm) [
+      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''