Skip to content

Fix jvm_flag support #93

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
Sep 13, 2016
Merged

Fix jvm_flag support #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
139fcc7
Fix jvm_flag support
oscar-stripe Sep 13, 2016
9dce76f
revert change of passed jvm_flags
oscar-stripe Sep 13, 2016
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
3 changes: 2 additions & 1 deletion scala/scala.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ SourceJars: {srcjars}
javac_opts=" ".join(ctx.attr.javacopts),
javac_path=ctx.file._javac.path,
java_files=",".join([f.path for f in java_srcs]),
# these are the flags passed to javac, which needs them prefixed by -J
jvm_flags=" ".join(["-J" + flag for flag in ctx.attr.jvm_flags]),
resource_src=",".join([f.path for f in ctx.files.resources]),
resource_dest=",".join(
Expand Down Expand Up @@ -218,7 +219,7 @@ SourceJars: {srcjars}
# be correctly handled since the executable is a jvm app that will
# consume the flags on startup.

arguments=list(ctx.attr.jvm_flags) + ["@" + argfile.path],
arguments=["--jvm_flag=%s" % flag for flag in ctx.attr.jvm_flags] + ["@" + argfile.path],
)


Expand Down