>From 140bd57646392dead06ca1cfedeff1777066b412 Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Sun, 9 Sep 2018 16:54:42 +1200 Subject: [PATCH] Clean up trace info by using relative paths for source files in build scripts --- egg-compile.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/egg-compile.scm b/egg-compile.scm index 948b7225..e63caf93 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -473,7 +473,6 @@ default-csc) platform)) (sname (prefix srcdir name)) - (ssname (and source (prefix srcdir source))) (opts (append (if (null? options) default-static-compilation-options options) @@ -493,7 +492,7 @@ (object-extension platform)) mode) platform)) - (src (qs* (or ssname (conc sname ".scm")) platform))) + (src (qs* (or source (conc name ".scm")) platform))) (when custom (prepare-custom-command cmd platform)) (print "\n" (qs* default-builder platform #t) " " out " " cmd @@ -535,9 +534,8 @@ (qs* (prefix srcdir (conc inline-file ".inline")) platform)) '()))) - (ssname (and source (prefix srcdir source))) (out (qs* (target-file (conc sname ".so") mode) platform)) - (src (qs* (or ssname (conc sname ".scm")) platform))) + (src (qs* (or source (conc name ".scm")) platform))) (when custom (prepare-custom-command cmd platform)) (print "\n" (qs* default-builder platform #t) " " out " " cmd @@ -562,7 +560,7 @@ options)) (out (qs* (target-file (conc sname ".import.so") mode) platform)) - (src (qs* (conc sname ".import.scm") platform))) + (src (qs* (conc name ".import.scm") platform))) (print "\n" (qs* default-builder platform #t) " " out " " cmd (if keep-generated-files " -k" "") " -setup-mode -s" @@ -581,7 +579,6 @@ default-csc) platform)) (sname (prefix srcdir name)) - (ssname (and source (prefix srcdir source))) (opts (if (null? options) default-dynamic-compilation-options options)) @@ -589,7 +586,7 @@ (executable-extension platform)) mode) platform)) - (src (qs* (or ssname (conc sname ".scm")) platform))) + (src (qs* (or source (conc name ".scm")) platform))) (when custom (prepare-custom-command cmd platform)) (print "\n" (qs* default-builder platform #t) " " out " " cmd @@ -612,7 +609,6 @@ default-csc) platform)) (sname (prefix srcdir name)) - (ssname (and source (prefix srcdir source))) (opts (if (null? options) default-static-compilation-options options)) @@ -620,7 +616,7 @@ (executable-extension platform)) mode) platform)) - (src (qs* (or ssname (conc sname ".scm")) platform))) + (src (qs* (or source (conc name ".scm")) platform))) (when custom (prepare-custom-command cmd platform)) (print "\n" (qs* default-builder platform #t) " " out " " cmd @@ -637,10 +633,8 @@ (define ((compile-generated-file name #!key source custom source-dependencies eggfile) srcdir platform) - (let* ((cmd (qs* (custom-cmd custom srcdir platform) platform)) - (sname (prefix srcdir name)) - (ssname (and source (prefix srcdir source))) - (out (qs* (or ssname sname) platform))) + (let ((cmd (qs* (custom-cmd custom srcdir platform) platform)) + (out (qs* (or source name) platform))) (prepare-custom-command cmd platform) (print "\n" (qs* default-builder platform #t) " " out " " cmd " : " cmd " " -- 2.11.0