mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-06-19 06:54:13 +00:00
Code Issues 1 Releases Wiki Activity

Address #387

Browse Source 
Introduce linker flags vs. library flags in jpm
in a backwards compatible way - most usage of lflags was for library
flags, so we will preserve that behavior.
This commit is contained in:
Calvin Rose 2020-05-09 21:11:26 -05:00
parent 1168f47768
commit a73ba56ebb
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
jpm
View File

@ -302,6 +302,19 @@
(def env (fiber/getenv (fiber/current))) (def env (fiber/getenv (fiber/current)))
(def threads? (not (not (env 'thread/new)))) (def threads? (not (not (env 'thread/new))))
# Default libraries to link
(def- thread-flags
(if is-win []
(if threads? ["-lpthread"] [])))
# lflags needed for the janet binary.
(def janet-lflags
(case (os/which)
:macos ["-ldl" "-lm" ;thread-flags]
:windows [;thread-flags]
:linux ["-lm" "-ldl" "-lrt" ;thread-flags]
["-lm" ;thread-flags]))
# Default flags for natives, but not required # Default flags for natives, but not required
(def default-lflags (if is-win ["/nologo"] [])) (def default-lflags (if is-win ["/nologo"] []))
(def default-cflags (def default-cflags
@ -309,17 +322,6 @@
["/nologo" "/MD"] ["/nologo" "/MD"]
["-std=c99" "-Wall" "-Wextra"])) ["-std=c99" "-Wall" "-Wextra"]))
# Default libraries to link
(def- thread-flags
(if is-win []
(if threads? ["-lpthread"] [])))
(def default-libs
(case (os/which)
:macos ["-ldl" "-lm" ;thread-flags]
:windows [;thread-flags]
:linux ["-lm" "-ldl" "-lrt" ;thread-flags]
["-lm" ;thread-flags]))
# Required flags for dynamic libraries. These # Required flags for dynamic libraries. These
# are used no matter what for dynamic libraries. # are used no matter what for dynamic libraries.
(def- dynamic-cflags (def- dynamic-cflags
@ -438,14 +440,14 @@
(def cflags (getcflags opts)) (def cflags (getcflags opts))
(def lflags [;(opt opts :lflags default-lflags) (def lflags [;(opt opts :lflags default-lflags)
;(if (opts :static) [] dynamic-lflags)]) ;(if (opts :static) [] dynamic-lflags)])
(def ldlibs [;(opt opts :libs default-libs)]) (def ldflags [;(opt opts :ldflags [])])
(rule target objects (rule target objects
(check-cc) (check-cc)
(print "linking " target "...") (print "linking " target "...")
(create-dirs target) (create-dirs target)
(if is-win (if is-win
(shell linker ;lflags (string "/OUT:" target) ;objects (win-import-library) ;ldlibs) (shell linker ;ldflags (string "/OUT:" target) ;objects (win-import-library) ;lflags)
(shell linker ;cflags ;lflags `-o` target ;objects ;ldlibs)))) (shell linker ;cflags ;ldflags `-o` target ;objects ;lflags))))
(defn- archive-c (defn- archive-c
"Link object files together to make a static library." "Link object files together to make a static library."
@ -582,7 +584,7 @@ int main(int argc, const char **argv) {
(def entry-env (dofile source)) (def entry-env (dofile source))
(def main ((entry-env 'main) :value)) (def main ((entry-env 'main) :value))
(def dep-lflags @[]) (def dep-lflags @[])
(def dep-libs @[]) (def dep-ldflags @[])
# Create marshalling dictionary # Create marshalling dictionary
(def mdict (invert (env-lookup root-env))) (def mdict (invert (env-lookup root-env)))
@ -616,8 +618,8 @@ int main(int argc, const char **argv) {
"\", 0);\n\n") "\", 0);\n\n")
(when-let [lfs (meta :lflags)] (when-let [lfs (meta :lflags)]
(array/concat dep-lflags lfs)) (array/concat dep-lflags lfs))
(when-let [lfs (meta :libs)] (when-let [lfs (meta :ldflags)]
(array/concat dep-libs lfs)) (array/concat dep-ldflags lfs))
(buffer/push-string declarations (buffer/push-string declarations
"extern void " "extern void "
(meta :static-entry) (meta :static-entry)
@ -632,14 +634,14 @@ int main(int argc, const char **argv) {
# Compile and link final exectable # Compile and link final exectable
(do (do
(def cc (opt opts :compiler default-compiler)) (def cc (opt opts :compiler default-compiler))
(def ldlibs [;dep-libs ;(opt opts :libs default-libs)]) (def ldflags [;dep-ldflags ;(opt opts :ldflags [])])
(def lflags [;dep-lflags ;(opt opts :lflags default-lflags)]) (def lflags [;static-libs (libjanet) ;dep-lflags ;(opt opts :lflags default-lflags) ;janet-lflags])
(def cflags (getcflags opts)) (def cflags (getcflags opts))
(def defines (make-defines (opt opts :defines {}))) (def defines (make-defines (opt opts :defines {})))
(print "compiling and linking " dest "...") (print "compiling and linking " dest "...")
(if is-win (if is-win
(shell cc ;cflags ;lflags cimage_dest ;static-libs (libjanet) ;ldlibs `/link` (string "/OUT:" dest)) (shell cc ;cflags ;ldflags cimage_dest ;lflags `/link` (string "/OUT:" dest))
(shell cc ;cflags ;lflags `-o` dest cimage_dest ;static-libs (libjanet) ;ldlibs))))) (shell cc ;cflags ;ldflags `-o` dest cimage_dest ;lflags)))))
# #
# Installation and Dependencies # Installation and Dependencies
@ -805,7 +807,7 @@ int main(int argc, const char **argv) {
"# Metadata for static library %s\n\n%.20p" "# Metadata for static library %s\n\n%.20p"
(string name statext) (string name statext)
{:static-entry ename {:static-entry ename
:libs ~',(opts :libs) :ldflags ~',(opts :ldflags)
:lflags ~',(opts :lflags)}))) :lflags ~',(opts :lflags)})))
(add-dep "build" metaname) (add-dep "build" metaname)
(install-rule metaname path) (install-rule metaname path)
@ -851,10 +853,10 @@ int main(int argc, const char **argv) {
is marshalled into bytecode which is then embedded in a final executable for distribution.\n\n is marshalled into bytecode which is then embedded in a final executable for distribution.\n\n
This executable can be installed as well to the --binpath given." This executable can be installed as well to the --binpath given."
[&keys {:install install :name name :entry entry :headers headers [&keys {:install install :name name :entry entry :headers headers
:cflags cflags :lflags lflags :deps deps :libs libs}] :cflags cflags :lflags lflags :deps deps :ldflags ldflags}]
(def name (if is-win (string name ".exe") name)) (def name (if is-win (string name ".exe") name))
(def dest (string "build" sep name)) (def dest (string "build" sep name))
(create-executable @{:cflags cflags :lflags lflags :libs libs} entry dest) (create-executable @{:cflags cflags :lflags lflags :ldflags ldflags} entry dest)
(add-dep "build" dest) (add-dep "build" dest)
(when headers (when headers
(each h headers (add-dep dest h))) (each h headers (add-dep dest h)))