diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-30 06:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-30 06:44:19 -0700 |
| commit | 43a8ef72fc35d6aa498735389639abd51b3d9585 (patch) | |
| tree | 13b03a8300ac6ac90991c468a3e39bfe72a275a0 | |
| parent | b8ef693a2af7463be0cfa3cc752decd4c4955587 (diff) | |
| parent | cb53da3cc1ff1d02028be13e42b4fcc40d5fd9b1 (diff) | |
| download | meson-43a8ef72fc35d6aa498735389639abd51b3d9585.zip meson-43a8ef72fc35d6aa498735389639abd51b3d9585.tar.gz meson-43a8ef72fc35d6aa498735389639abd51b3d9585.tar.bz2 | |
Merge pull request #965 from schultetwin/serialize_native_executable_exe_wrapper_cross_build
Serialize native executable exe wrapper cross build
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/backend/backends.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/authors.txt b/authors.txt index 5931481..f591d13 100644 --- a/authors.txt +++ b/authors.txt @@ -53,3 +53,4 @@ Gautier Pelloux-Prayer Alexandre Foley Jouni Kosonen Aurelien Jarno +Mark Schulte diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index fd71924..e91b44b 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -200,11 +200,15 @@ class Backend(): with open(exe_data, 'wb') as f: if isinstance(exe, dependencies.ExternalProgram): exe_fullpath = exe.fullpath + exe_needs_wrapper = False elif isinstance(exe, (build.BuildTarget, build.CustomTarget)): exe_fullpath = [self.get_target_filename_abs(exe)] + exe_needs_wrapper = exe.is_cross else: exe_fullpath = [exe] - is_cross = self.environment.is_cross_build() and \ + exe_needs_wrapper = False + is_cross = exe_needs_wrapper and \ + self.environment.is_cross_build() and \ self.environment.cross_info.need_cross_compiler() and \ self.environment.cross_info.need_exe_wrapper() if is_cross: |