From a1fcde6161b01a083184d151bc08e97c9ab76ff9 Mon Sep 17 00:00:00 2001 From: Ashley Coleman Date: Wed, 7 Feb 2024 14:50:08 -0800 Subject: [PATCH] Revert "Update wake-format's search libdir to match wake's libdir" (#1510) --- tools/wake-format/main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/wake-format/main.cpp b/tools/wake-format/main.cpp index 888bd8133..eb26e1fb3 100644 --- a/tools/wake-format/main.cpp +++ b/tools/wake-format/main.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -36,7 +35,6 @@ #include "parser/syntax.h" #include "parser/wakefiles.h" #include "util/diagnostic.h" -#include "util/execpath.h" #include "util/file.h" #include "wcl/diff.h" #include "wcl/xoshiro_256.h" @@ -201,9 +199,7 @@ int main(int argc, char **argv) { user_warn = fopen("/dev/null", "w"); if (auto_find_files) { bool ok = true; - // Use the standard libdir to more closely match wake discovery - std::string libdir = wcl::make_canonical(find_execpath() + "/../share/wake/lib"); - wakefiles = find_all_wakefiles(ok, true, false, libdir, ".", user_warn); + wakefiles = find_all_wakefiles(ok, true, false, ".", ".", user_warn); if (!ok) { std::cerr << "Failed to automatically discover wake files" << std::endl; exit(EXIT_FAILURE);