Mesa (main): meson: correctly detect linker arguments
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 16 18:44:29 UTC 2021
Module: Mesa
Branch: main
Commit: 631b3fe3e9e27302d48051f7d5bef5e4e1bb0e40
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=631b3fe3e9e27302d48051f7d5bef5e4e1bb0e40
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>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 07ef92dbff8..03dda9ee3e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1210,7 +1210,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',
@@ -1219,7 +1219,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',
More information about the mesa-commit
mailing list