Skip to content

Sync with 0.5.9 snapshots - add copt and cppopt flags #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2025
+38 −3
Merged

Sync with 0.5.9 snapshots - add copt and cppopt flags #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a4644c
Sync with 0.5.9 snapshots - add copt and cppopt flags
WojciechMazur Oct 12, 2025
2b239e1
Test with latest snapshot
WojciechMazur Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20251012-9628085-SNAPSHOT")

val crossScalaVersions212 = (14 to 20).map("2.12." + _)
val crossScalaVersions213 = (8 to 17).map("2.13." + _)
Expand Down
37 changes: 35 additions & 2 deletions cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>")
Expand Down
2 changes: 2 additions & 0 deletions cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down