Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compilers: Convert args to cc.{links,run} from unix to native 

This allows build files to pass -L and -l flags and have them converted
automatically as needed.
This commit is contained in:
Nirbheek Chauhan 2016-04-19 00:30:29 +05:30
parent 35ef1d109a
commit d87f2f5b42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/compilers.py
View File

@ -520,7 +520,8 @@ int main () {{ {1}; }}'''
ofile = open(srcname, 'w') ofile = open(srcname, 'w')
ofile.write(code) ofile.write(code)
ofile.close() ofile.close()
extra_args = extra_args + self.get_output_args(dstname) extra_args = self.unix_link_flags_to_native(extra_args) + \
self.get_output_args(dstname)
p = self.compile(code, srcname, extra_args) p = self.compile(code, srcname, extra_args)
try: try:
os.remove(dstname) os.remove(dstname)
@ -539,7 +540,7 @@ int main () {{ {1}; }}'''
ofile.close() ofile.close()
exename = srcname + '.exe' # Is guaranteed to be executable on every platform. exename = srcname + '.exe' # Is guaranteed to be executable on every platform.
commands = self.get_exelist() commands = self.get_exelist()
commands += extra_args commands += self.unix_link_flags_to_native(extra_args)
commands.append(srcname) commands.append(srcname)
commands += self.get_output_args(exename) commands += self.get_output_args(exename)
p = subprocess.Popen(commands, cwd=os.path.split(srcname)[0], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(commands, cwd=os.path.split(srcname)[0], stdout=subprocess.PIPE, stderr=subprocess.PIPE)