Skip to content

Commit

Permalink
crossfiles: Streamline and simplify crossfiles
Browse files Browse the repository at this point in the history
* `needs_exe_wrapper` is only needed in specific cases when
  `exe_wrapper` is not set.
  See https://mesonbuild.com/Cross-compilation.html#properties

* "Before 0.56.0, <lang>_args and <lang>_link_args must be put in the
   properties section instead, else they will be ignored."
   [https://mesonbuild.com/Machine-files.html#meson-builtin-options]
   Our minimum version is 0.49.0. Meson >= 0.56.0 prints a deprecation
   warning.
  • Loading branch information
anotherwon authored and Frank Bossen committed Mar 17, 2024
1 parent 7a31542 commit 93f261a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package/crossfiles/aarch64-android.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ needs_exe_wrapper = true
[host_machine]
system = 'android'
cpu_family = 'aarch64'
endian = 'little'
cpu = 'aarch64'
endian = 'little'
2 changes: 1 addition & 1 deletion package/crossfiles/arm-android.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ needs_exe_wrapper = true
[host_machine]
system = 'android'
cpu_family = 'arm'
endian = 'little'
cpu = 'arm'
endian = 'little'
3 changes: 1 addition & 2 deletions package/crossfiles/i686-w64-mingw32.meson
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ cpp = 'i686-w64-mingw32-g++'
ar = 'i686-w64-mingw32-ar'
strip = 'i686-w64-mingw32-strip'
windres = 'i686-w64-mingw32-windres'
exe_wrapper = ['wine']
exe_wrapper = 'wine'

[properties]
c_link_args = ['-static-libgcc']
needs_exe_wrapper = true

[host_machine]
system = 'windows'
Expand Down
8 changes: 2 additions & 6 deletions package/crossfiles/wasm32.meson
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ c = 'emcc'
cpp = 'em++'
ar = 'emar'
strip = 'emstrip'
exe_wrapper = ['node']

[built-in options]
c_link_args = ['-sEXPORT_ALL=1']
cpp_link_args = ['-sEXPORT_ALL=1']
exe_wrapper = 'node'

[properties]
needs_exe_wrapper = true
c_link_args = ['-sEXPORT_ALL=1']

[host_machine]
system = 'emscripten'
Expand Down
8 changes: 2 additions & 6 deletions package/crossfiles/wasm64.meson
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ c = 'emcc'
cpp = 'em++'
ar = 'emar'
strip = 'emstrip'
exe_wrapper = ['node']

[built-in options]
c_link_args = ['-sEXPORT_ALL=1']
cpp_link_args = ['-sEXPORT_ALL=1']
exe_wrapper = 'node'

[properties]
needs_exe_wrapper = true
c_link_args = ['-sEXPORT_ALL=1']

[host_machine]
system = 'emscripten'
Expand Down
3 changes: 1 addition & 2 deletions package/crossfiles/x86_64-w64-mingw32.meson
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip'
windres = 'x86_64-w64-mingw32-windres'
exe_wrapper = ['wine']
exe_wrapper = 'wine'

[properties]
c_link_args = ['-static-libgcc']
needs_exe_wrapper = true

[host_machine]
system = 'windows'
Expand Down

0 comments on commit 93f261a

Please sign in to comment.