From 8163eb41854c370fa6e5318cd3f5621ecb43048a Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Tue, 12 Jan 2021 00:53:05 +0100 Subject: [PATCH] [meta] Do not use built-in arguments Breaks ancient meson versions. Should fix #1893. --- build-win32.txt | 4 ---- build-win64.txt | 4 ---- meson.build | 3 +++ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build-win32.txt b/build-win32.txt index 2cb5cf0ad..a14068327 100644 --- a/build-win32.txt +++ b/build-win32.txt @@ -4,10 +4,6 @@ cpp = 'i686-w64-mingw32-g++' ar = 'i686-w64-mingw32-ar' strip = 'i686-w64-mingw32-strip' -[built-in options] -c_link_args = ['-static', '-static-libgcc'] -cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] - [properties] needs_exe_wrapper = true diff --git a/build-win64.txt b/build-win64.txt index 1fad5ab75..1aee4626e 100644 --- a/build-win64.txt +++ b/build-win64.txt @@ -4,10 +4,6 @@ cpp = 'x86_64-w64-mingw32-g++' ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' -[built-in options] -c_link_args = ['-static', '-static-libgcc'] -cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] - [properties] needs_exe_wrapper = true diff --git a/meson.build b/meson.build index 5cb6299ae..97182367f 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,9 @@ dxvk_extradep = [ ] if dxvk_compiler.get_id() == 'msvc' wrc = find_program('rc') else + add_global_link_arguments('-static', '-static-libgcc', language: 'c') + add_global_link_arguments('-static', '-static-libgcc', '-static-libstdc++', language: 'cpp') + if cpu_family == 'x86_64' wrc = find_program('x86_64-w64-mingw32-windres') elif cpu_family == 'x86'