From a81a54c835073ad1421a45e370a1a484d1b393b8 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Sat, 13 Oct 2018 10:29:23 +0200 Subject: [PATCH] Do not try to be clever: also emit type/inline files when compiling statically. This fixes #1550 by always emitting the types and inline files when requested, so we don't fail if chicken-do decides to compile the static extensions first, when there are components that depend on the current component plus the inline or types file that belong to it. --- egg-compile.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/egg-compile.scm b/egg-compile.scm index 9c1b9f82..02ec5fc1 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -390,17 +390,8 @@ (append (if (memq 'dynamic link) (list (apply compile-dynamic-extension data)) '()) - (if (memq 'static link) - ;; if compiling both static + dynamic, override - ;; types-file: + inline-file: properties to - ;; avoid generating things twice: - (list (apply compile-static-extension - (if (memq 'dynamic link) - (cons (car data) - (append '(types-file: #f - inline-file: #f) - (cdr data))) - data))) + (if (memq 'static link) + (list (apply compile-static-extension data)) '()) (if (uses-compiled-import-library? mode) (map (lambda (mod) -- 2.11.0