aboutsummaryrefslogtreecommitdiff
path: root/src/lisp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-11-02 17:35:47 +0000
committerdos-reis <gdr@axiomatics.org>2008-11-02 17:35:47 +0000
commite05241ed11702813eb225b084643720deb121d26 (patch)
tree141640d08c75914909827a32456eb37e81884a05 /src/lisp
parent5b6ee712b35a1220b3ae9b422f5aa395ad6600cd (diff)
downloadopen-axiom-e05241ed11702813eb225b084643720deb121d26.tar.gz
* lisp/core.lisp.in (|$ExtraRuntimeLibraries|): Listify.
(extra-runtime-libs): Tidy. * lisp/Makefile.in (edit): stringify $(oa_c_runtime_extra) elements.
Diffstat (limited to 'src/lisp')
-rw-r--r--src/lisp/Makefile.in2
-rw-r--r--src/lisp/core.lisp.in11
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 726a017f..c187df70 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -143,7 +143,7 @@ edit = sed \
-e 's|@target[@]|$(target)|g' \
-e 's|@SHREXT[@]|$(SHREXT)|g' \
-e 's|@LIBEXT[@]|$(LIBEXT)|g' \
- -e 's|@oa_c_runtime_extra[@]|$(oa_c_runtime_extra)|g' \
+ -e 's|@oa_c_runtime_extra[@]|$(patsubst %,"%",$(oa_c_runtime_extra))|g' \
-e 's|@oa_standard_linking[@]|$(oa_standard_linking)|g' \
-e 's|@void_type[@]|$(void_type)|g' \
-e 's|@char_type[@]|$(char_type)|g' \
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index d19e1e5a..af3f27d0 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -189,14 +189,15 @@
;; C runtime needed by the target system; e.g. -lm or -lwinsock
(defconstant |$ExtraRuntimeLibraries|
- "@oa_c_runtime_extra@")
+ '(@oa_c_runtime_extra@))
(defun extra-runtime-libs nil
(if (boot-completed-p)
- (list (concatenate 'string "-L" (|systemLibraryDirectory|))
- (concatenate 'string "-l" |$CoreLibName|)
- |$ExtraRuntimeLibraries|)
- (list |$ExtraRuntimeLibraries|)))
+ (append
+ (list (concatenate 'string "-L" (|systemLibraryDirectory|))
+ (concatenate 'string "-l" |$CoreLibName|))
+ |$ExtraRuntimeLibraries|)
+ |$ExtraRuntimeLibraries|))
#+:clisp