Fix --cc-flag to allow multiple flags (#150)

Author: lucatrv

README.md

@@ -93,7 +93,7 @@ usage: juliac.jl [-v] [-q] [-d <dir>] [-n <name>] [-p <file>] [-c]
                  [--compile {yes|no|all|min}] [-C <target>]
                  [-O {0,1,2,3}] [-g <level>] [--inline {yes|no}]
                  [--check-bounds {yes|no}] [--math-mode {ieee,fast}]
-                 [--cc <cc>] [--cc-flags <flags>] [--version] [-h]
+                 [--cc <cc>] [--cc-flag <flag>] [--version] [-h]
                  juliaprog [cprog]
 
 Static Julia Compiler
@@ -162,8 +162,9 @@ optional arguments:
                         disallow or enable unsafe floating point
                         optimizations
   --cc <cc>             system C compiler
-  --cc-flags <flags>    pass custom flags to the system C compiler
-                        when building a shared library or executable
+  --cc-flag <flag>      pass custom flag to the system C compiler when
+                        building a shared library or executable, can
+                        be repeated for multiple flags
   --version             show version information and exit
   -h, --help            show this help message and exit
 

juliac.jl

@@ -144,10 +144,12 @@ Base.@ccallable function julia_main(args::Vector{String})::Cint
             arg_type = String
             metavar = "<cc>"
             help = "system C compiler"
-        "--cc-flags"
+        "--cc-flag"
             arg_type = String
-            metavar = "<flags>"
-            help = "pass custom flags to the system C compiler when building a shared library or executable"
+            action = :append_arg
+            dest_name = "cc-flags"
+            metavar = "<flag>"
+            help = "pass custom flag to the system C compiler when building a shared library or executable, can be repeated for multiple flags"
     end
 
     s.epilog = """

src/static_julia.jl

@@ -65,7 +65,7 @@ compiles the Julia file at path `juliaprog` with keyword arguments:
     check_bounds {yes|no}            emit bounds checks always or never
     math_mode {ieee,fast}            disallow or enable unsafe floating point optimizations
     cc                               system C compiler
-    cc_flags <flags>                 pass custom flags to the system C compiler when building a shared library or executable
+    cc_flags <flags>                 pass custom flags to the system C compiler when building a shared library or executable (either `nothing` or a string array)
 """
 function static_julia(
         juliaprog;

test/runtests.jl

@@ -92,10 +92,10 @@ end
         @test isfile(joinpath(builddir, "hello.$(PackageCompiler.Libdl.dlext)"))
         @test isfile(joinpath(builddir, "hello$executable_ext"))
         @test success(`$(joinpath(builddir, "hello$executable_ext"))`)
-        @testset "--cc-flags" begin
+        @testset "--cc-flag" begin
             # Try passing `--help` to $cc. This should work for any system compiler.
             # Then grep the output for "-g", which should be present on any system.
-            @test occursin("-g", read(`$julia $juliac -se --cc-flags="--help" $jlfile $cfile --builddir $builddir`, String))
+            @test occursin("-g", read(`$julia $juliac -se --cc-flag="--help" $jlfile $cfile --builddir $builddir`, String))
             # Just as a control, make sure that without passing '--help', we don't see "-g"
             @test !occursin("-g", read(`$julia $juliac -se $jlfile $cfile --builddir $builddir`, String))
         end