Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-09 22:17:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added -COBJ option

Browse source
This commit is contained in:
Justin Ethier 2020-08-14 16:44:43 -04:00
parent 370535869a
commit dc64d52412
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## 0.20 - TBD
Features
- Added the `-COBJ` compiler flag to allow Cyclone to link an executable using objects that are generated by an external source such as a makefile.
## 0.19 - August 3, 2020 ## 0.19 - August 3, 2020
Features Features

15
cyclone.scm
View file

@ -683,7 +683,9 @@
(read-all/source port filename)))) (read-all/source port filename))))
;; Compile and emit: ;; Compile and emit:
(define (run-compiler args cc? cc-prog cc-exec cc-lib cc-so cc-prog-linker-opts append-dirs prepend-dirs) (define (run-compiler args cc? cc-prog cc-exec cc-lib cc-so
cc-prog-linker-opts cc-prog-linker-objs
append-dirs prepend-dirs)
(let* ((in-file (car args)) (let* ((in-file (car args))
(expander (base-expander)) (expander (base-expander))
(in-prog-raw (read-file in-file)) (in-prog-raw (read-file in-file))
@ -734,12 +736,14 @@
(cond (cond
(program? (program?
(letrec ((objs-str (letrec ((objs-str
(string-append
cc-prog-linker-objs
(apply (apply
string-append string-append
(map (map
(lambda (i) (lambda (i)
(string-append " " (lib:import->filename i ".o" append-dirs prepend-dirs) " ")) (string-append " " (lib:import->filename i ".o" append-dirs prepend-dirs) " "))
lib-deps))) lib-deps))))
(comp-prog-cmd (comp-prog-cmd
(string-replace-all (string-replace-all
(string-replace-all (string-replace-all
@ -842,6 +846,7 @@
(cc-lib (apply string-append (collect-opt-values args "-CL"))) (cc-lib (apply string-append (collect-opt-values args "-CL")))
(cc-so (apply string-append (collect-opt-values args "-CS"))) (cc-so (apply string-append (collect-opt-values args "-CS")))
(cc-linker-opts (apply string-append (collect-opt-values args "-CLNK"))) (cc-linker-opts (apply string-append (collect-opt-values args "-CLNK")))
(cc-linker-extra-objects (apply string-append (collect-opt-values args "-COBJ")))
(opt-beta-expand-thresh (collect-opt-values args "-opt-be")) (opt-beta-expand-thresh (collect-opt-values args "-opt-be"))
(append-dirs (collect-opt-values args "-A")) (append-dirs (collect-opt-values args "-A"))
(prepend-dirs (collect-opt-values args "-I"))) (prepend-dirs (collect-opt-values args "-I")))
@ -895,6 +900,10 @@ General options:
a library module. a library module.
-CS cc-commands Specify a custom command line for the C compiler to compile -CS cc-commands Specify a custom command line for the C compiler to compile
a shared object module. a shared object module.
-COBJ objects Specify additional object files to send to the compiler
when linking a program. For example, this may be used
to link an executable where some object files are generated
via a makefile instead of by Cyclone.
-CLNK option Specify a custom command to provide as a linker option, -CLNK option Specify a custom command to provide as a linker option,
EG: \"-lcurl\". EG: \"-lcurl\".
-d Only generate intermediate C files, do not compile them -d Only generate intermediate C files, do not compile them
@ -972,5 +981,5 @@ Debug options:
(cdr err)) (cdr err))
(newline) (newline)
(exit 1))) (exit 1)))
(run-compiler non-opts compile? cc-prog cc-exec cc-lib cc-so cc-linker-opts append-dirs prepend-dirs))))) (run-compiler non-opts compile? cc-prog cc-exec cc-lib cc-so cc-linker-opts cc-linker-extra-objects append-dirs prepend-dirs)))))