aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/vs2010backend.py
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-03-29 00:37:03 +0200
committerNicolas Schneider <nioncode+git@gmail.com>2016-03-29 12:08:09 +0200
commit330be891c1cbc115bef765c04730b1004d5cb20a (patch)
treedba514995b8e06120ba5790c8c578d92749ee4b3 /mesonbuild/backend/vs2010backend.py
parent37d74736156e3146df5945f259fc71e959ca5dd2 (diff)
downloadmeson-330be891c1cbc115bef765c04730b1004d5cb20a.zip
meson-330be891c1cbc115bef765c04730b1004d5cb20a.tar.gz
meson-330be891c1cbc115bef765c04730b1004d5cb20a.tar.bz2
vs2010: fix generator command
A shebang line on Windows will be resolved to [binary, script_path]. Thus, we need to use both instead of just taking the first element of the command.
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r--mesonbuild/backend/vs2010backend.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index ec10d4c..3aa3ca8 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -51,10 +51,7 @@ class Vs2010Backend(backends.Backend):
exe = generator.get_exe()
infilelist = genlist.get_infilelist()
outfilelist = genlist.get_outfilelist()
- if isinstance(exe, build.BuildTarget):
- exe_file = os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))
- else:
- exe_file = exe.get_command()[0]
+ exe_arr = self.exe_object_to_cmd_array(exe)
base_args = generator.get_arglist()
for i in range(len(infilelist)):
if len(infilelist) == len(outfilelist):
@@ -70,7 +67,7 @@ class Vs2010Backend(backends.Backend):
for x in base_args]
args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.get_target_private_dir(target))
for x in args]
- fullcmd = [exe_file] + args
+ fullcmd = exe_arr + args
commands.append(' '.join(self.special_quote(fullcmd)))
inputs.append(infilename)
outputs.extend(outfiles)