cleanup: Remove locate-dylan-compiler; assume it's on the PATH

What was I thinking?
cgay · Dec 29, 2024 · bce91ff · bce91ff
1 parent df85417
commit bce91ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/sources/commands/build.dylan b/sources/commands/build.dylan
@@ -54,10 +54,9 @@ define method execute-subcommand
                 | error("No libraries found in workspace and no"
                           " default libraries configured."));
   end;
-  let dylan-compiler = locate-dylan-compiler();
   for (name in library-names)
     // TODO: this should pass -target dll in some cases.
-    let command = remove(vector(dylan-compiler,
+    let command = remove(vector("dylan-compiler",
                                 "-compile",
                                 get-option-value(subcmd, "clean") & "-clean",
                                 get-option-value(subcmd, "link") & "-link",
@@ -68,8 +67,8 @@ define method execute-subcommand
     let env = make-compilation-environment(ws);
     let exit-status
       = os/run-application(command,
-                           environment: env, // adds to the existing environment
-                           under-shell?: #f,
+                           environment: env, // AUGMENTS the existing environment
+                           under-shell?: #t,
                            working-directory: ws/workspace-directory(ws));
     if (exit-status ~== 0)
       error("Build of %= failed with exit status %=.", name, exit-status);

diff --git a/sources/library.dylan b/sources/library.dylan
@@ -41,8 +41,7 @@ define module shared
     note,
     verbose,
     trace,
-    warn,
-    locate-dylan-compiler;
+    warn;
 end module;
 
 define module pacman

diff --git a/sources/shared.dylan b/sources/shared.dylan
@@ -40,22 +40,3 @@ end;
 define inline function warn (fmt, #rest args) => ()
   apply(note, concat("WARNING: ", fmt), args);
 end;
-
-
-// Find the full path to dylan-compiler or signal an error.
-define function locate-dylan-compiler () => (dc :: <string>)
-  let output = with-output-to-string (stream)
-                 local method outputter (output, #key end: epos)
-                         write(stream, copy-sequence(output, end: epos));
-                       end;
-                 os/run-application("which dylan-compiler",
-                                    under-shell?: #t,
-                                    outputter: outputter);
-               end;
-  let lines = split-lines(output);
-  if (lines[0].size > 0)
-    lines[0]
-  else
-    error("dylan-compiler not found. Is it on your PATH?");
-  end
-end function;