Skip to content

Commit

Permalink
fix error introduced into non-hermetic nailgun zinc invocations
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicexplorer committed Feb 11, 2019
1 parent 13bfb29 commit 4c0b5b3
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,19 @@ def relative_to_exec_root(path):
scala_path = [classpath_entry.path for classpath_entry in scalac_classpath_entries]

zinc_args = []
# TODO: The scopt option parsing from rsc-and-zinc.jar says -classpath alone isn't recognized.
classpath_arg_name = self.execution_strategy_enum.resolve_for_enum_variant({
self.HERMETIC_WITH_NAILGUN: '--classpath',
self.HERMETIC: '-classpath',
self.SUBPROCESS: '-classpath',
self.NAILGUN: '-classpath',
})
zinc_args.extend([
# TODO: for some reason this argument isn't accepted (although it is also later on the command
# line, and that appears to work -- unclear)!
# '-log-level', self.get_options().level,
'-analysis-cache', analysis_cache,
'--classpath', ':'.join(relative_classpath),
classpath_arg_name, ':'.join(relative_classpath),
'-d', classes_dir,
])
if not self.get_options().colors:
Expand Down

0 comments on commit 4c0b5b3

Please sign in to comment.