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

Make native build work again.

This commit is contained in:
Jussi Pakkanen 2013-08-30 23:00:19 +03:00
parent 52ed7fd8f8
commit 29174b669f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environment.py
View File

@ -847,9 +847,9 @@ class Environment():
path = os.path.split(__file__)[0]
return os.path.join(path, 'depfixer.py')
def detect_cpp_compiler(self):
def detect_cpp_compiler(self, want_cross):
evar = 'CXX'
if self.is_cross_build():
if self.is_cross_build() and want_cross:
compilers = [self.cross_info['cpp']]
ccache = []
is_cross = True

8
interpreter.py
View File

@ -592,17 +592,17 @@ class Executable(BuildTarget):
self.filename = self.name
class StaticLibrary(BuildTarget):
def __init__(self, name, subdir, sources, environment, kwargs):
BuildTarget.__init__(self, name, subdir, sources, kwargs)
def __init__(self, name, subdir, is_cross, sources, environment, kwargs):
BuildTarget.__init__(self, name, subdir, is_cross, sources, kwargs)
prefix = environment.get_static_lib_prefix()
suffix = environment.get_static_lib_suffix()
self.filename = prefix + self.name + '.' + suffix
class SharedLibrary(BuildTarget):
def __init__(self, name, subdir, sources, environment, kwargs):
def __init__(self, name, subdir, is_cross, sources, environment, kwargs):
self.version = None
self.soversion = None
BuildTarget.__init__(self, name, subdir, sources, kwargs)
BuildTarget.__init__(self, name, subdir, is_cross, sources, kwargs)
self.prefix = environment.get_shared_lib_prefix()
self.suffix = environment.get_shared_lib_suffix()