Merge pull request #183917 from uri-canva/bazel-libtool

bazel_5: get libtool from path

authored by Uri Baghin and committed by GitHub e30abcd5 d1c11328

+2 -1
+2 -1
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
··· 377 # invocations of gcc to clang, but vanilla clang doesn't 378 sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl 379 380 - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl 381 wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) 382 for wrapper in "''${wrappers[@]}"; do 383 sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper 384 done 385 '';
··· 377 # invocations of gcc to clang, but vanilla clang doesn't 378 sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl 379 380 + sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl 381 wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) 382 for wrapper in "''${wrappers[@]}"; do 383 + sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper 384 sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper 385 done 386 '';