From af5836202ce06df0a96b36eb4a7cec7544c876eb Mon Sep 17 00:00:00 2001 From: pancake Date: Sun, 8 Nov 2020 17:45:32 +0100 Subject: [PATCH] js: fix wrong filename and invalid backend selected when using -o .js (#6777) --- vlib/v/builder/js.v | 6 +++++- vlib/v/pref/pref.v | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vlib/v/builder/js.v b/vlib/v/builder/js.v index b9a60e6165..10a99619a1 100644 --- a/vlib/v/builder/js.v +++ b/vlib/v/builder/js.v @@ -45,7 +45,11 @@ pub fn (mut b Builder) compile_js() { println('all .v files:') println(files) } - b.build_js(files, b.pref.out_name + '.js') + mut name := b.pref.out_name + if !name.ends_with('.js') { + name += '.js' + } + b.build_js(files, name) } fn (mut b Builder) run_js() { diff --git a/vlib/v/pref/pref.v b/vlib/v/pref/pref.v index 419ad90b06..4e83af5d5c 100644 --- a/vlib/v/pref/pref.v +++ b/vlib/v/pref/pref.v @@ -316,6 +316,9 @@ pub fn parse_args(args []string) (&Preferences, string) { } '-o' { res.out_name = cmdline.option(current_args, '-o', '') + if res.out_name.ends_with('.js') { + res.backend = .js + } i++ } '-b' {