Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at python-updates 26 lines 954 B view raw
1diff --git a/art/runtime/native_stack_dump.cc b/art/runtime/native_stack_dump.cc 2index 150fa782..2fca7caf 100644 3--- a/art/runtime/native_stack_dump.cc 4+++ b/art/runtime/native_stack_dump.cc 5@@ -76,7 +76,7 @@ std::string FindAddr2line() { 6 return std::string(env_value) + kAddr2linePrebuiltPath; 7 } 8 } 9- return std::string("/usr/bin/addr2line"); 10+ return std::string("addr2line"); 11 } 12 13 ALWAYS_INLINE 14diff --git a/art/tools/timeout_dumper/timeout_dumper.cc b/art/tools/timeout_dumper/timeout_dumper.cc 15index 08d2f4c0..513324ad 100644 16--- a/art/tools/timeout_dumper/timeout_dumper.cc 17+++ b/art/tools/timeout_dumper/timeout_dumper.cc 18@@ -122,7 +122,7 @@ std::unique_ptr<std::string> FindAddr2line() { 19 } 20 } 21 22- constexpr const char* kHostAddr2line = "/usr/bin/addr2line"; 23+ constexpr const char* kHostAddr2line = "addr2line"; 24 if (access(kHostAddr2line, F_OK) == 0) { 25 return std::make_unique<std::string>(kHostAddr2line); 26 }