diff options
Diffstat (limited to 'src/lisp/Makefile.in')
| -rw-r--r-- | src/lisp/Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index b2b16486..2df4a9b9 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -47,7 +47,7 @@ build_libdir = ./$(top_builddir)/src/lib ## Consequently we temporarily give up here, e.g., we don't ## instruct GCL to use Libtool on Windows. GCL_LTCC = $(if $(findstring mingw, $(target)),"","$(LIBTOOL) --tag=CC --mode=compile ") -GCL_LTLD = $(if $(findstring mingw, $(target)),"","$(LIBTOOL) --tag=CC --mode=link ") +GCL_LTLD = $(if $(findstring mingw, $(target)),"$(CXX) $(LDFLAGS) -o ","$(CXXLINK) -o ") ## Again, ideally, we would like GCL to link with the compiled Lisp ## code from core.lisp. However, the general interface compiler::link @@ -93,13 +93,10 @@ lisp_c_objects = \ $(OUT)/lisp$(EXEEXT): base-lisp$(EXEEXT) ifeq (@axiom_lisp_flavor@,gcl) echo '(let* ((sys-cc compiler::*cc*) ' \ - ' (sys-ld compiler::*ld*) ' \ ' (compiler::*cc* (concatenate (quote string) ' \ ' $(GCL_LTCC) ' \ ' sys-cc)) ' \ - ' (compiler::*ld* (concatenate (quote string) ' \ - ' $(GCL_LTLD) ' \ - ' sys-ld))) ' \ + ' (compiler::*ld* $(GCL_LTLD))) ' \ '(compiler::link (quote ($(FASLS))) "lisp$(EXEEXT)" ' \ ' (format nil "(progn (let ((*load-path* (cons ~S *load-path*))'\ ' (si::*load-types* ~S)))' \ @@ -143,6 +140,8 @@ oa_keep_files = $(patsubst %,|%|,$(subst $(oa_comma), ,@oa_keep_files@)) edit = sed \ -e 's|@open_axiom_installdir[@]|$(open_axiom_installdir)|g' \ -e 's|@oa_optimize_options[@]|$(oa_optimize_options)|g' \ + -e 's|@CXX[@]|$(CXX)|g' \ + -e 's|@LDFLAGS[@]|$(LDFLAGS)|g' \ -e 's|@oa_editor[@]|$(oa_editor)|g' \ -e 's/@oa_keep_files[@]/$(oa_keep_files)/g' \ -e 's|@host[@]|$(host)|g' \ |