Sync with 0.5.9 snapshots - add copt and cppopt flags

Author: WojciechMazur

build.sbt

@@ -3,7 +3,7 @@ import scala.scalanative.nir.Proxy.nativeBinaryVersion
 
 val ScalaNativeVersion = envOrNone("CI_NATIVE_VERSION")
   .filterNot(_.isEmpty)
-  .getOrElse("0.5.8")
+  .getOrElse("0.5.9-20251011-f1febb9-SNAPSHOT")
 
 val crossScalaVersions212 = (14 to 20).map("2.12." + _)
 val crossScalaVersions213 = (8 to 17).map("2.13." + _)

cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala

@@ -25,6 +25,8 @@ case class NativeConfigOptions(
     ltp: List[String] = List.empty,
     linkingOption: List[String] = List.empty,
     compileOption: List[String] = List.empty,
+    cCompileOptions: List[String] = List.empty,
+    cppCompileOptions: List[String] = List.empty,
     targetTriple: Option[String] = None,
     clang: Option[String] = None,
     clangPP: Option[String] = None,
@@ -227,12 +229,43 @@ object NativeConfigOptions {
       .valueName("<passed-option>")
       .optional()
       .unbounded()
-      .action((x, c) =>
+      .action((value, c) =>
         c.copy(nativeConfig =
-          c.nativeConfig.copy(compileOption = c.nativeConfig.compileOption :+ x)
+          c.nativeConfig
+            .copy(cCompileOptions = c.nativeConfig.cCompileOptions :+ value)
         )
       )
       .text("Compilation options passed to LLVM. Multiple can be defined.")
+    parser
+      .opt[String]("c-compile-option")
+      .valueName("<option>")
+      .optional()
+      .unbounded()
+      .abbr("-copt")
+      .text(
+        "Compilation options used when compiling C files only. Multiple can be defined."
+      )
+      .action((value, c) =>
+        c.copy(nativeConfig =
+          c.nativeConfig
+            .copy(cCompileOptions = c.nativeConfig.cCompileOptions :+ value)
+        )
+      )
+    parser
+      .opt[String]("cpp-compile-option")
+      .valueName("<option>")
+      .optional()
+      .unbounded()
+      .abbr("-cppopt")
+      .text(
+        "Compilation options used when compiling C++ files only. Multiple can be defined."
+      )
+      .action((value, c) =>
+        c.copy(nativeConfig =
+          c.nativeConfig
+            .copy(cCompileOptions = c.nativeConfig.cppCompileOptions :+ value)
+        )
+      )
     parser
       .opt[String]("target-triple")
       .valueName("<config-string>")

cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala

@@ -113,6 +113,8 @@ object ConfigConverter {
       .withClang(clang)
       .withClangPP(clangPP)
       .withCompileOptions(options.nativeConfig.compileOption)
+      .withCOptions(options.nativeConfig.cCompileOptions)
+      .withCppOptions(options.nativeConfig.cppCompileOptions)
       .withLinkingOptions(options.nativeConfig.linkingOption)
       .withLinktimeProperties(ltp)
       .withBuildTarget(options.nativeConfig.buildTarget)