From f1f301c9661c2ebcaa40a503624cb5b6ea317c45 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 9 Apr 2006 22:40:31 +0000 Subject: [PATCH] fix broken translation of env variables into executable paths svn: r2648 --- collects/dynext/compile-unit.ss | 7 ++++--- collects/dynext/link-unit.ss | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/collects/dynext/compile-unit.ss b/collects/dynext/compile-unit.ss index f41af9a39a..ce1349b03d 100644 --- a/collects/dynext/compile-unit.ss +++ b/collects/dynext/compile-unit.ss @@ -28,9 +28,10 @@ (make-parameter (or (let ([p (or (getenv "MZSCHEME_DYNEXT_COMPILER") (getenv "CC"))]) - (if (and p (absolute-path? p)) - (find-executable-path p #f) - p)) + (and p + (if (absolute-path? p) + (string->path p) + (find-executable-path p #f)))) (case (system-type) [(unix macosx) (get-unix-compile)] [(windows) (get-windows-compile)] diff --git a/collects/dynext/link-unit.ss b/collects/dynext/link-unit.ss index 763649e8fb..4c38ec524f 100644 --- a/collects/dynext/link-unit.ss +++ b/collects/dynext/link-unit.ss @@ -42,9 +42,10 @@ (define current-extension-linker (make-parameter (or (let ([p (getenv "MZSCHEME_DYNEXT_LINKER")]) - (if (and p (absolute-path? p)) - (find-executable-path p #f) - p)) + (and p + (if (absolute-path? p) + (string->path p) + (find-executable-path p #f)))) (case (system-type) [(unix macosx) (get-unix-linker)] [(windows) (get-windows-linker)]