Mesa (staging/21.3): meson: correctly detect linker arguments

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 0d72d992853178889841b6d456683b2f6aa76c50
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d72d992853178889841b6d456683b2f6aa76c50

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Nov 25 21:51:07 2021 +0100

meson: correctly detect linker arguments

Fixes: 22673a98 ("meson: Check arguments before adding")
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13961>
(cherry picked from commit 631b3fe3e9e27302d48051f7d5bef5e4e1bb0e40)

---

 .pick_status.json | 2 +-
 meson.build       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index ac650493a63..57869491358 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -265,7 +265,7 @@
         "description": "meson: correctly detect linker arguments",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "22673a980f30cf71ea1d7e3d4feb161c549d48a4"
     },
diff --git a/meson.build b/meson.build
index bd54e784c7b..0aea31260bb 100644
--- a/meson.build
+++ b/meson.build
@@ -1211,7 +1211,7 @@ if host_machine.system() == 'windows'
     endif
   else
     add_project_link_arguments(
-      cc.get_supported_arguments(
+      cc.get_supported_link_arguments(
         '-Wl,--nxcompat',
         '-Wl,--dynamicbase',
         '-static-libgcc',
@@ -1220,7 +1220,7 @@ if host_machine.system() == 'windows'
       language : ['c'],
     )
     add_project_link_arguments(
-      cpp.get_supported_arguments(
+      cpp.get_supported_link_arguments(
         '-Wl,--nxcompat',
         '-Wl,--dynamicbase',
         '-static-libgcc',