mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
48 lines
1.3 KiB
Diff
48 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
|
|
--- meson.build.orig 2020-06-18 11:13:57.716321962 +0200
|
|
+++ meson.build 2020-06-18 11:19:50.456861311 +0200
|
|
@@ -45,7 +45,7 @@
|
|
cc = meson.get_compiler('c')
|
|
|
|
symbols_check = find_program('symbols-check.py')
|
|
-prog_nm = find_program('nm')
|
|
+prog_nm = find_program(get_option('nm-path'))
|
|
|
|
# Check for atomics
|
|
intel_atomics = false
|
|
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
|
|
|