>From 83f3df3ecaa0449156b5423a4612f6ef2f153836 Mon Sep 17 00:00:00 2001 From: Kooda Date: Wed, 23 Jan 2019 12:34:43 +0100 Subject: [PATCH 2/3] Add 'linkage' to the component-options specification of eggs --- egg-compile.scm | 9 +++++---- manual/Egg specification format | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/egg-compile.scm b/egg-compile.scm index ba4ed67c..da277179 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -190,7 +190,7 @@ (sdeps '()) (src #f) (cbuild #f) - (link default-extension-linkage) + (link (if (null? link) default-extension-linkage link)) (tfile #f) (ptfile #f) (ifile #f) @@ -239,7 +239,7 @@ (sdeps '()) (src #f) (cbuild #f) - (link default-extension-linkage) + (link (if (null? link) default-extension-linkage link)) (oname #f) (mods #f) (opts opts)) @@ -325,7 +325,7 @@ (sdeps '()) (cbuild #f) (src #f) - (link default-program-linkage) + (link (if (null? link) default-program-linkage link)) (lobjs '()) (lopts lopts) (oname #f) @@ -408,7 +408,8 @@ (case (car info) ((csc-options) (set! opts (append opts (cdr info)))) ((link-options) (set! lopts (append lopts (cdr info)))) - (else (error "invalid option specification" info)))) + ((linkage) (set! link (append link (cdr info)))) + (else (error "invalid component-options specification" info)))) (define (compile-cond-expand info walk) (let loop ((clauses (cdr info))) (cond ((null? clauses) diff --git a/manual/Egg specification format b/manual/Egg specification format index 20b1dd0f..24b45038 100644 --- a/manual/Egg specification format +++ b/manual/Egg specification format @@ -145,7 +145,7 @@ intended for cross compilation. [egg property] (component-options OPTIONSPEC ...) Specifies global options for all programs and extensions compiled for this egg. -{{OPTIONSPEC}} may be {{csc-options}} or {{link-options}} specifications. +{{OPTIONSPEC}} may be {{csc-options}}, {{link-options}} or {{linkage}} specifications. ==== cond-expand -- 2.20.1