mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-31 09:10:08 +00:00
2a53e7f0eb
The last hunk in `link-static-libraries.patch` was dropped because
upstream dropped that code block in:
f93a1630cc
Also unblocks build failure on `aarch64-linux` (that I know of).
19 lines
785 B
Diff
19 lines
785 B
Diff
Instead of looking up static libraries by hand in `$CUDA_PATH/lib{64,}` (which does not work with
|
|
the split CUDA redistributables), link them like any other library, so that the compiler wrapper
|
|
finds them in the (nix) `buildInputs`.
|
|
|
|
--- a/install/cupy_builder/cupy_setup_build.py
|
|
+++ b/install/cupy_builder/cupy_setup_build.py
|
|
@@ -423,10 +423,7 @@
|
|
|
|
s = copy.deepcopy(settings)
|
|
if not no_cuda:
|
|
- s['libraries'] = module.libraries
|
|
- s['extra_objects'] = [
|
|
- _find_static_library(name) for name in module.static_libraries
|
|
- ]
|
|
+ s['libraries'] = module.static_libraries + module.libraries
|
|
|
|
compile_args = s.setdefault('extra_compile_args', [])
|
|
link_args = s.setdefault('extra_link_args', [])
|