mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-30 09:33:41 +00:00
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
|
From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||
|
|
Date: Fri, 2 Aug 2019 10:26:37 +0100
|
||
|
|
Subject: [PATCH] meson: support for custom nm path
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
When cross-compiling target toolchains i.e. binutils are often
|
||
|
|
prefixed by its target architecture. This patch gives the user
|
||
|
|
to option to specify the nm used during the build process.
|
||
|
|
|
||
|
|
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||
|
|
---
|
||
|
|
meson.build | 2 +-
|
||
|
|
meson_options.txt | 6 ++++++
|
||
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index e292554a..64607139 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -327,7 +327,7 @@ pkg.generate(
|
||
|
|
)
|
||
|
|
|
||
|
|
env_test = environment()
|
||
|
|
-env_test.set('NM', find_program('nm').path())
|
||
|
|
+env_test.set('NM', find_program(get_option('nm-path')).path())
|
||
|
|
|
||
|
|
if with_libkms
|
||
|
|
subdir('libkms')
|
||
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
||
|
|
index 8af33f1c..b4f46a52 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -141,3 +141,9 @@ option(
|
||
|
|
value : false,
|
||
|
|
description : 'Enable support for using udev instead of mknod.',
|
||
|
|
)
|
||
|
|
+option(
|
||
|
|
+ 'nm-path',
|
||
|
|
+ type : 'string',
|
||
|
|
+ description : 'path to nm',
|
||
|
|
+ value : 'nm'
|
||
|
|
+)
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|