~ chicken-core (chicken-5) a4274bc9973129759229b0bd766beb98b2ceaf97
commit a4274bc9973129759229b0bd766beb98b2ceaf97
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Tue Apr 30 22:19:42 2019 +1200
Commit: Kooda <kooda@upyum.com>
CommitDate: Mon May 6 12:48:53 2019 +0200
Always regenerate import libraries when chicken-do is used
When building an egg, `chicken-do' considers the modification times of
import libraries when determining whether to build the files from which
they're generated generated. So, if `csc' skips regenerating an import
library because its imports haven't changed, the file that emits it will
be stuck in an outdated state and will always be rebuilt, unnecessarily.
This can lead to more extra work than is saved by not emitting the
import library in the first place, so introduce a flag to disable this
optimisation and use it when `chicken-do' is involved.
Signed-off-by: Kooda <kooda@upyum.com>
diff --git a/batch-driver.scm b/batch-driver.scm
index 4a4a370e..731c0a94 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -370,6 +370,8 @@
(set! unsafe #t) )
(when (memq 'setup-mode options)
(set! ##sys#setup-mode #t))
+ (when (memq 'regenerate-import-libraries options)
+ (set! preserve-unchanged-import-libraries #f))
(when (memq 'disable-interrupts options) (set! insert-timer-checks #f))
(when (memq 'fixnum-arithmetic options) (set! number-type 'fixnum))
(when (memq 'block options) (set! block-compilation #t))
diff --git a/c-platform.scm b/c-platform.scm
index 37429841..cac8bbbc 100644
--- a/c-platform.scm
+++ b/c-platform.scm
@@ -102,7 +102,7 @@
no-bound-checks no-procedure-checks-for-usual-bindings no-compiler-syntax
no-parentheses-synonyms no-symbol-escape r5rs-syntax emit-all-import-libraries
strict-types clustering lfa2 debug-info
- setup-mode no-module-registration) )
+ regenerate-import-libraries setup-mode no-module-registration))
(define valid-compiler-options-with-argument
'(debug emit-link-file
diff --git a/chicken.mdoc b/chicken.mdoc
index 4c285c86..8812909f 100644
--- a/chicken.mdoc
+++ b/chicken.mdoc
@@ -239,6 +239,9 @@ Display debugging output for the given modes.
Do not generate implicit init- and exit code.
.It Fl emit-external-prototypes-first
Emit prototypes for callbacks before foreign declarations.
+.It Fl regenerate-import-libraries
+Always emit import libraries, even when their contents haven't changed.
+The default behaviour is to preserve existing import libraries.
.It Fl ignore-repository
Do not refer to repository for extensions.
.It Fl setup-mode
diff --git a/core.scm b/core.scm
index eabba538..39ae7a82 100644
--- a/core.scm
+++ b/core.scm
@@ -287,7 +287,8 @@
process-declaration file-requirements
;; Various ugly global boolean flags that get set by the (batch) driver
- all-import-libraries bootstrap-mode compiler-syntax-enabled
+ all-import-libraries preserve-unchanged-import-libraries
+ bootstrap-mode compiler-syntax-enabled
emit-closure-info emit-profile enable-inline-files explicit-use-flag
first-analysis no-bound-checks enable-module-registration
optimize-leaf-routines standalone-executable undefine-shadowed-macros
@@ -400,6 +401,7 @@
(define profiled-procedures #f)
(define import-libraries '())
(define all-import-libraries #f)
+(define preserve-unchanged-import-libraries #t)
(define enable-module-registration #t)
(define standalone-executable #t)
(define local-definitions #f)
@@ -604,7 +606,7 @@
(oldimps
(and (file-exists? fname)
(call-with-input-file fname read-expressions))))
- (cond ((equal? imps oldimps)
+ (cond ((and (equal? imps oldimps) preserve-unchanged-import-libraries)
(when verbose-mode
(print "not generating import library `" fname "' for module `"
name "' because imports did not change")) )
diff --git a/csc.mdoc b/csc.mdoc
index b645882b..701460e6 100644
--- a/csc.mdoc
+++ b/csc.mdoc
@@ -318,6 +318,9 @@ Use a compiler other than the default
Do not generate implicit init- and exit code.
.It Fl emit-external-prototypes-first
Emit prototypes for callbacks before foreign declarations.
+.It Fl regenerate-import-libraries
+Always emit import libraries, even when their contents haven't changed.
+The default behaviour is to preserve existing import libraries.
.It Fl ignore-repository
Do not refer to repository for extensions.
.It Fl keep-shadowed-macros
diff --git a/csc.scm b/csc.scm
index 9b192692..1cf9d5c5 100644
--- a/csc.scm
+++ b/csc.scm
@@ -152,7 +152,7 @@
-no-symbol-escape -no-parentheses-synonyms -r5rs-syntax
-no-argc-checks -no-bound-checks -no-procedure-checks -no-compiler-syntax
-emit-all-import-libraries -no-elevation -no-module-registration
- -no-procedure-checks-for-usual-bindings
+ -no-procedure-checks-for-usual-bindings -regenerate-import-libraries
-specialize -strict-types -clustering -lfa2 -debug-info
-no-procedure-checks-for-toplevel-bindings))
@@ -494,6 +494,7 @@ Usage: #{csc} [OPTION ...] [FILENAME ...]
-emit-external-prototypes-first
emit prototypes for callbacks before foreign
declarations
+ -regenerate-import-libraries emit import libraries even when unchanged
-ignore-repository do not refer to repository for extensions
-keep-shadowed-macros do not remove shadowed macro
-host compile for host when configured for
diff --git a/egg-compile.scm b/egg-compile.scm
index 4f8bd538..33191c36 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -605,6 +605,7 @@
(filelist srcdir source-dependencies platform)
" : " cmd
(if keep-generated-files " -k" "")
+ " -regenerate-import-libraries"
" -setup-mode -static -I " srcdir
" -emit-link-file " lfile
(if (eq? mode 'host) " -host" "")
@@ -679,6 +680,7 @@
(if keep-generated-files " -k" "")
(if (eq? mode 'host) " -host" "")
" -D compiling-extension -J -s"
+ " -regenerate-import-libraries"
" -setup-mode -I " srcdir
" -C -I" srcdir
(arglist opts platform)
diff --git a/manual/Using the compiler b/manual/Using the compiler
index 2448528f..51d905d4 100644
--- a/manual/Using the compiler
+++ b/manual/Using the compiler
@@ -50,6 +50,8 @@ the source text should be read from standard input.
; -emit-external-prototypes-first : Emit prototypes for callbacks defined with {{define-external}} before any other foreign declarations. This is sometimes useful, when C/C++ code embedded into the a Scheme program has to access the callbacks. By default the prototypes are emitted after foreign declarations.
+; -regenerate-import-libraries : Always emit new import libraries, even when their contents haven't changed. The default behaviour is to preserve existing import libraries.
+
; -emit-import-library MODULE : Specifies that an import library named {{MODULE.import.scm}} for the named module should be generated (equivalent to using the {{emit-import-library}} declaration).
; -emit-inline-file FILENAME : Write procedures that can be globally inlined in internal form to {{FILENAME}}, if global inlining is enabled. Implies {{-inline -local}}. If the inline-file would be empty (because no procedure would be inlinable) no file is generated and any existing inline-file with that name is deleted.
diff --git a/support.scm b/support.scm
index 44352e98..ebc181d6 100644
--- a/support.scm
+++ b/support.scm
@@ -1814,6 +1814,7 @@ Usage: chicken FILENAME [OPTION ...]
-emit-external-prototypes-first
emit prototypes for callbacks before foreign
declarations
+ -regenerate-import-libraries emit import libraries even when unchanged
-ignore-repository do not refer to repository for extensions
-setup-mode prefer the current directory when locating extensions
Trap