Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

llvm: add libedit #300157

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

llvm: add libedit #300157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/12/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -76,7 +77,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ ncurses ]
Expand Down Expand Up @@ -231,6 +232,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/13/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -68,7 +69,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ]
Expand Down Expand Up @@ -189,6 +190,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/14/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -78,7 +79,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = [ ncurses zlib ];
Expand Down Expand Up @@ -193,6 +194,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/15/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -90,7 +91,7 @@ in stdenv.mkDerivation (rec {
python3Packages.sphinx python3Packages.recommonmark
];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = [ ncurses zlib ];
Expand Down Expand Up @@ -325,6 +326,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/16/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -92,7 +93,7 @@ in
python3Packages.sphinx python3Packages.recommonmark
];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = [ ncurses zlib ];
Expand Down Expand Up @@ -317,6 +318,7 @@ in
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/llvm/17/llvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
, libbfd
, libpfm
, libxml2
, libedit
, ncurses
, version
, release_version
Expand Down Expand Up @@ -91,7 +92,7 @@ stdenv.mkDerivation (rec {
python3Packages.sphinx python3Packages.recommonmark
];

buildInputs = [ libxml2 libffi ]
buildInputs = [ libxml2 libffi libedit ]
++ optional enablePFM libpfm; # exegesis

propagatedBuildInputs = [ ncurses zlib ];
Expand Down Expand Up @@ -313,6 +314,7 @@ stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_ENABLE_LIBEDIT=FORCE_ON"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is FORCE_ON necessary? If it is, can you conditionalize it on libedit != null so that it can be switched off with .override { libedit = null; }.

] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
Expand Down