From a2c0c852bc7733073e7039b7205d9114e4e4d1ad Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 25 Jul 2007 18:46:25 +0000 Subject: [PATCH] call xform with string, check DarwinPorts lib location (PR 8784) svn: r6965 --- collects/make/setup-extension.ss | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/collects/make/setup-extension.ss b/collects/make/setup-extension.ss index eec44c8740..0f56f1ec5b 100644 --- a/collects/make/setup-extension.ss +++ b/collects/make/setup-extension.ss @@ -6,7 +6,6 @@ (lib "file.ss" "dynext") (lib "file.ss") (lib "list.ss") - (lib "process.ss") (lib "etc.ss") (lib "launcher.ss" "launcher") (lib "xform.ss" "compiler") @@ -132,6 +131,8 @@ "/usr/local/gnu" ;; OS X fink location: "/sw" + ;; OS X DarwinPorts location: + "/opt/local" ;; Hack for NU PLT's convenience: "/arch/gnu/packages/readline-4.2"))) @@ -256,11 +257,16 @@ headers extra-depends) (lambda () - (xform #f xform-src.c file.c (list (let-values ([(base name dir?) - (split-path xform-src.c)]) - (if (path? base) - base - (current-directory))) - mz-inc-dir))))) + (xform #f + (if (path? xform-src.c) + (path->string xform-src.c) + xform-src.c) + file.c + (list (let-values ([(base name dir?) + (split-path xform-src.c)]) + (if (path? base) + base + (current-directory))) + mz-inc-dir))))) null)) #())))))))))))))