cc-wrapper: gross hack for staging-next to fix scipy **revert this when merging staging-next to staging** #225273
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ofborg build python3Packages.scipy Should build correctly. |
|
@ofborg build python3Packages.scikit-learn |
vcunat
requested changes
Apr 8, 2023
|
Speaking of temporary hacks this one worked for me: --- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -56,4 +56,6 @@ buildPythonPackage rec {
'';
+ NIX_LDFLAGS = "-L${stdenv.cc.cc.lib}/lib";
+
doCheck = !stdenv.isAarch64;
(It would probably need adding a condition on |
|
Pushed as 46f29d4 as momentary unblocker. |
This comment was marked as outdated.
This comment was marked as outdated.
ghost
closed this
added 3 commits
April 8, 2023 11:30
As suggested by @trofi here: #209870 (comment) This should fix failures among packages which use gfortran: #209870 (comment) https://hydra.nixos.org/build/215195834
In #209870 I tried to unify the treatment of clang and gcc in cc-wrapper as much as possible. However it appears that I went too far. Clang requires -isystem flags in order to be able to find gcc's libstdc++. Gcc does not need these flags. If they are added, gfortran will get confused: #209870 (comment) This commit deunifies the chunk of code that adds the -isystem flags, and explains why this chunk applies only to clang.
…en merging staging-next to staging**
ghost
reopened this
ghost
marked this pull request as draft
github-actions
bot
added
6.topic: python
6.topic: stdenv
|
Maybe we won't need this more complex temporary hack (i.e. do this smaller amount of rebuilds). So far I'm not aware of any package needing it. |
|
That's what I assumed so far. |
|
It's certainly simpler and hopefully it will suffice. |
Sounds good. |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#225220 plus an ugly hack to avoid a mass-rebuild on staging-next