gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #329961 from ExpidusOS/fix/pkgsllvm/boost

Browse Source 
boost{,-build}: fix building with llvm
This commit is contained in:
tomberek
2024-08-16 02:15:21 -04:00
committed by GitHub
parent 926aefdd61 3e6180e984
commit 61c828ce8f
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/boost/fix-clang-target.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/tools/build/src/tools/clang.jam 2024-07-25 10:38:16.278401900 -0700
+++ b/tools/build/src/tools/clang.jam 2024-07-25 10:38:52.659750666 -0700
@@ -90,11 +90,6 @@
case x86-64 : arch = x86_64 ;
case x86-32 : arch = i386 ;
}
-
- toolset.flags $(toolset)
- OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_)
- : "--target=$(arch)-$(vendor-sys)"
- : unchecked ;
}
}
}
pkgs/development/libraries/boost/generic.nix
+2 -1
View File
@@ -150,7 +150,8 @@ stdenv.mkDerivation {
stripLen = 1;
extraPrefix = "libs/python/";
})
];
]
++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch;
meta = with lib; {
homepage = "http://boost.org/";
pkgs/development/tools/boost-build/default.nix
+2 -1
View File
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
sourceRoot="$sourceRoot/tools/build"
'';
patches = useBoost.boostBuildPatches or [];
patches = useBoost.boostBuildPatches or []
++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch;
# Upstream defaults to gcc on darwin, but we use clang.
postPatch = ''
pkgs/development/tools/boost-build/fix-clang-target.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/src/tools/clang.jam 2024-07-25 10:38:16.278401900 -0700
+++ b/src/tools/clang.jam 2024-07-25 10:38:52.659750666 -0700
@@ -90,11 +90,6 @@
case x86-64 : arch = x86_64 ;
case x86-32 : arch = i386 ;
}
-
- toolset.flags $(toolset)
- OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_)
- : "--target=$(arch)-$(vendor-sys)"
- : unchecked ;
}
}
}