1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From 71e642abf7129b553521df8dddf4511383016a78 Mon Sep 17 00:00:00 2001
From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Mon, 4 Aug 2014 19:40:32 +0100
Subject: [PATCH] cgcc: use $ccom to set $multiarch_dir if not specified
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Christopher Li <sparse@chrisli.org>
Origin: upstream, commit:71e642abf7129b553521df8dddf4511383016a78
---
cgcc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cgcc b/cgcc
index d6392e0aa75a..8ee8da123522 100755
--- a/cgcc
+++ b/cgcc
@@ -77,6 +77,8 @@ if ($do_check) {
chomp($gcc_base_dir); # possibly remove '\n' from compiler
$check .= " -gcc-base-dir " . $gcc_base_dir if $gcc_base_dir;
+ $multiarch_dir = qx($ccom -print-multiarch) if ! defined $multiarch_dir;
+ chomp($multiarch_dir); # possibly remove '\n' from compiler
$check .= " -multiarch-dir " . $multiarch_dir if $multiarch_dir;
print "$check\n" if $verbose;
--
2.1.4
|
