diff options
Diffstat (limited to 'pkgs/development/tools/boost-build')
| -rw-r--r-- | pkgs/development/tools/boost-build/darwin-default-toolset.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/boost-build/default.nix | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/tools/boost-build/darwin-default-toolset.patch b/pkgs/development/tools/boost-build/darwin-default-toolset.patch new file mode 100644 index 000000000000..ebe3f8d2e1ea --- /dev/null +++ b/pkgs/development/tools/boost-build/darwin-default-toolset.patch @@ -0,0 +1,12 @@ +diff --git a/src/build-system.jam b/src/build-system.jam +index 60425c54..c6842217 100644 +--- a/src/build-system.jam ++++ b/src/build-system.jam +@@ -644,7 +644,7 @@ local rule should-clean-project ( project ) + } + else if [ os.name ] = MACOSX + { +- default-toolset = darwin ; ++ default-toolset = clang-darwin ; + } + } diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index a821e661a604..5016aa590b5f 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; }; + patches = [ + # Upstream defaults to gcc on darwin, but we use clang. + ./darwin-default-toolset.patch + ]; + nativeBuildInputs = [ bison ]; |