Commit 8f947e41 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

pkgsCross.wasi32.pkgsBuildTarget.llvm_{{5,12},git}: disable gold plugin on wasi 

In https://github.com/NixOS/nixpkgs/pull/211126 I simplified `binutils`
and `libbfd` derivations to follow upstream binutils build system
closer. As a result of `./configure --target=wasm32-unknown-wasi`
`binutils` does not install plugin headers by default.

This causes `pkgsCross.wasi32.llvm_12` (used by `firefox`) to fail the
build as:

    [ 81%] Building CXX object tools/gold/CMakeFiles/LLVMgold.dir/gold-plugin.cpp.o
    /build/llvm/tools/gold/gold-plugin.cpp:38:10: fatal error:
        plugin-api.h: No such file or directory
       38 | #include <plugin-api.h>
          |          ^~~~~~~~~~~~~~

The change accomodates this constraint to disable plugin support for
`wasi` targets.
parent f46ee73b

pkgs/development/compilers/llvm/10/llvm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, cmake

, python3

, libffi

, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)

, libbfd

, libpfm

, libxml2
@@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { 
    "-DSPHINX_OUTPUT_MAN=ON"

    "-DSPHINX_OUTPUT_HTML=OFF"

    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

  ] ++ optionals (!isDarwin) [

  ] ++ optionals (enableGoldPlugin) [

    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"

  ] ++ optionals isDarwin [

    "-DLLVM_ENABLE_LIBCXX=ON"

pkgs/development/compilers/llvm/11/llvm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, cmake

, python3

, libffi

, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)

, libbfd

, libpfm

, libxml2
@@ -203,7 +204,7 @@ in stdenv.mkDerivation (rec { 
    "-DSPHINX_OUTPUT_MAN=ON"

    "-DSPHINX_OUTPUT_HTML=OFF"

    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

  ] ++ optionals (!isDarwin) [

  ] ++ optionals (enableGoldPlugin) [

    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"

  ] ++ optionals isDarwin [

    "-DLLVM_ENABLE_LIBCXX=ON"

pkgs/development/compilers/llvm/12/llvm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, cmake

, python3

, libffi

, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)

, libbfd

, libpfm

, libxml2
@@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { 
    "-DSPHINX_OUTPUT_MAN=ON"

    "-DSPHINX_OUTPUT_HTML=OFF"

    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

  ] ++ optionals (!isDarwin) [

  ] ++ optionals (enableGoldPlugin) [

    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"

  ] ++ optionals isDarwin [

    "-DLLVM_ENABLE_LIBCXX=ON"

pkgs/development/compilers/llvm/5/llvm/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, cmake

, python3

, libffi

, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)

, libbfd

, libxml2

, ncurses
@@ -168,10 +169,9 @@ stdenv.mkDerivation (rec { 
    "-DSPHINX_OUTPUT_MAN=ON"

    "-DSPHINX_OUTPUT_HTML=OFF"

    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

  ]

  ++ lib.optional (!isDarwin)

  ] ++ lib.optionals (enableGoldPlugin) [

    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"

  ++ lib.optionals (isDarwin) [

  ] ++ lib.optionals (isDarwin) [

    "-DLLVM_ENABLE_LIBCXX=ON"

    "-DCAN_TARGET_i386=false"

  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

pkgs/development/compilers/llvm/6/llvm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, cmake

, python3

, libffi

, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)

, libbfd

, libxml2

, ncurses
@@ -162,7 +163,7 @@ stdenv.mkDerivation (rec { 
    "-DSPHINX_OUTPUT_MAN=ON"

    "-DSPHINX_OUTPUT_HTML=OFF"

    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

  ] ++ optionals (!isDarwin) [

  ] ++ optionals (enableGoldPlugin) [

    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"

  ] ++ optionals (isDarwin) [

    "-DLLVM_ENABLE_LIBCXX=ON"