Search correct path to executables in Windows.

Author: dmsc

src/compiler/main.cc

@@ -324,7 +324,6 @@ int main(int argc, char **argv)
     }
     for(auto &f : asm_files)
     {
-        auto ca65 = os::compiler_path("ca65");
         auto asm_name = std::get<0>(f), obj_name = std::get<1>(f);
         auto lst_name = os::add_extension(obj_name, ".lst");
 
@@ -336,15 +335,14 @@ int main(int argc, char **argv)
         for(auto &o : asm_opts)
             args.push_back(o);
         args.push_back(asm_name);
-        auto e = os::prog_exec(ca65, args);
+        auto e = os::prog_exec("ca65", args);
         if(e)
             return show_error("can't assemble file\n");
         if(!one_step)
             temp_files.push_back(obj_name);
     }
     if(link_files.size())
     {
-        auto ld65 = os::compiler_path("ld65");
         //$LD65" -C "$CFGFILE" "$@" -o "$XEX" -Ln "$LBL" "$FB.lib"
         std::cerr << "LINK " << exe_name << "\n";
         std::vector<std::string> args{"ld65",
@@ -359,7 +357,7 @@ int main(int argc, char **argv)
         for(auto &f : link_files)
             args.push_back(f);
         args.push_back(lib_name);
-        auto e = os::prog_exec(ld65, args);
+        auto e = os::prog_exec("ld65", args);
         if(e)
             return show_error("can't assemble file\n");
     }

src/compiler/os.cc

@@ -160,6 +160,7 @@ int os::prog_exec(std::string exe, std::vector<std::string> &args)
 {
     std::vector<const char *> pargs;
 #ifdef _WIN32
+    auto exe_path = os::compiler_path(exe + ".exe");
     // Escape any string with spaces in it:
     std::vector<std::string> esc_args;
     for(const auto &s : args)
@@ -175,8 +176,9 @@ int os::prog_exec(std::string exe, std::vector<std::string> &args)
     pargs.push_back(nullptr);
     // win32 has the "spawn" function that calls the program and waits
     // for termination:
-    return _spawnv(_P_WAIT, exe.c_str(), (char **)pargs.data());
+    return _spawnv(_P_WAIT, exe_path.c_str(), (char **)pargs.data());
 #else
+    auto exe_path = os::compiler_path(exe);
     // Create a vector with C pointers
     for(const auto &s : args)
         pargs.push_back(s.c_str());
@@ -205,7 +207,7 @@ int os::prog_exec(std::string exe, std::vector<std::string> &args)
         sigaction(SIGQUIT, &sa, nullptr);
         sigprocmask(SIG_SETMASK, &oldmask, nullptr);
         // Exec process
-        execv(exe.c_str(), (char **)pargs.data());
+        execv(exe_path.c_str(), (char **)pargs.data());
         // If we got here, it is an error
         _exit(127);
     }