diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-10 23:06:58 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-10 23:06:58 +0000 |
| commit | e663f5f211469940ee2403f7cb18b29e3ab597bb (patch) | |
| tree | 0c366de4817c8e627a45c6a8e5a6039a0b3b08ca | |
| parent | 4d4f8f3638dfe65d82f2343ce19fc367aa42337c (diff) | |
| download | open-axiom-e663f5f211469940ee2403f7cb18b29e3ab597bb.tar.gz | |
specify linker for ECL
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/sockio-c.c | 2 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 12 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0149510b..1f3b28ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lisp/core.lisp.in (compileLispFile): Tell ECL that the linker is + a C++ compiler. + 2011-03-22 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/op.spad.pamphlet (BasicOperator) [display]: Now return a diff --git a/src/lib/sockio-c.c b/src/lib/sockio-c.c index 09b41a8d..31439c43 100644 --- a/src/lib/sockio-c.c +++ b/src/lib/sockio-c.c @@ -1274,7 +1274,7 @@ sock_accept_connection(int purpose) rd = server_mask; ret_val = sselect(FD_SETSIZE, (fd_set *)&rd, (fd_set *)0, (fd_set *)0, NULL); if (ret_val == -1) { - /* perror ("Select"); */ + perror ("Select"); return -1; } for(i=0; i<2; i++) { diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 7f7e6357..f746c4c1 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -853,11 +853,13 @@ (compile-file file :output-file out-file :system-p t :c-file t :h-file t) (compile-file file :output-file out-file :system-p t)) - #+:ecl (if (and result (not failure-p) - (null (c::build-fasl (compile-file-pathname out-file) - :lisp-files `(,out-file) - :ld-flags (extra-runtime-libs)))) - (setq result nil)) + #+:ecl + (let ((compiler::*ld* oa-cxx)) + (if (and result (not failure-p) + (null (c::build-fasl (compile-file-pathname out-file) + :lisp-files `(,out-file) + :ld-flags (extra-runtime-libs)))) + (setq result nil))) (cond ((null result) (|coreError| "compilation of Lisp code failed")) (failure-p |