stdcxx: do not pass -stdlib=libc++ to the linker

2019-11-19 16:31:11 +01:00 · 2019-11-19 16:31:11 +01:00 · 0263e06fbe
parent 206b86a5ae
commit 0263e06fbe
2 changed files with 2 additions and 3 deletions
--- a/pkgs/stdcxx/default.nix
+++ b/pkgs/stdcxx/default.nix
@ -18,8 +18,8 @@ in stdenv.mkDerivation rec {
  dontBuild = true;

  installPhase = ''
-    cflags=$NIX_CXXSTDLIB_COMPILE libs=$NIX_CXXSTDLIB_LINK \
-    	substituteAll ${./stdcxx.pc} ${pname}.pc
+    cflags=$NIX_CXXSTDLIB_COMPILE \
+      substituteAll ${./stdcxx.pc} ${pname}.pc
    mkdir -p $out/lib/pkgconfig
    install -Dm444 *.pc $out/lib/pkgconfig
  '';
--- a/pkgs/stdcxx/stdcxx.pc
+++ b/pkgs/stdcxx/stdcxx.pc
@ -3,4 +3,3 @@ Description: Genode Standard C++ library
 Version: @version@
 Requires: libc libm
 Cflags:  @cflags@
-Libs: @libs@