diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-11-02 17:35:47 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-11-02 17:35:47 +0000 |
| commit | e05241ed11702813eb225b084643720deb121d26 (patch) | |
| tree | 141640d08c75914909827a32456eb37e81884a05 /src | |
| parent | 5b6ee712b35a1220b3ae9b422f5aa395ad6600cd (diff) | |
| download | open-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')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/types.boot | 4 | ||||
| -rw-r--r-- | src/lisp/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 11 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f30c7c60..815f7ec0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2008-11-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (|$ExtraRuntimeLibraries|): Listify. + (extra-runtime-libs): Tidy. + * lisp/Makefile.in (edit): stringify $(oa_c_runtime_extra) elements. + +2008-11-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * driver/utils.c (OPENAXIOM_DEFAULT_DRIVER): Can no longer be openaxiom_unknown_driver. (openaxiom_preprocess_arguments): If a file is specified, then it diff --git a/src/interp/types.boot b/src/interp/types.boot index 00b55d64..66f3ce61 100644 --- a/src/interp/types.boot +++ b/src/interp/types.boot @@ -128,12 +128,8 @@ namespace BOOT %Env <=> %List -- compiling env %Mode <=> %Symbol or %String or %List -- type of forms %Code <=> %Form -- generated code -)if %hasFeature KEYWORD::ECL -%Triple <=> %List -- ??? ECL has trouble with the spec below -)else %Triple <=> -- form + type + env cons(%Code,cons(%Mode,cons(%Env,null))) -)endif %Signature -- signature <=> %Symbol or cons 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 |