| 1 |
From b4ab43f12cc44a24e8161eb2d0857b78c756b18c Mon Sep 17 00:00:00 2001
|
| 2 |
From: Mike Frysinger <vapier@chromium.org>
|
| 3 |
Date: Tue, 14 Aug 2012 14:24:28 -0400
|
| 4 |
Subject: [PATCH] do not error out on generic-gnu + --enable-shared
|
| 5 |
|
| 6 |
If you build with --enabled-shared on a Linux arch not explicitly
|
| 7 |
listed, the configure script will abort because it didn't detect
|
| 8 |
"linux" in the fallback generic-gnu tuple.
|
| 9 |
|
| 10 |
Since this is the fallback tuple and people are passing
|
| 11 |
--enable-shared, assume the user knows what they're in for.
|
| 12 |
|
| 13 |
Change-Id: Ia35b657e7247c8855e3a94fca424c9884d4241e3
|
| 14 |
---
|
| 15 |
configure | 8 +++++++-
|
| 16 |
1 file changed, 7 insertions(+), 1 deletion(-)
|
| 17 |
|
| 18 |
diff --git a/configure b/configure
|
| 19 |
index 2e19e5b..dde215f 100755
|
| 20 |
--- a/configure
|
| 21 |
+++ b/configure
|
| 22 |
@@ -454,7 +454,13 @@ process_detect() {
|
| 23 |
# Can only build shared libs on a subset of platforms. Doing this check
|
| 24 |
# here rather than at option parse time because the target auto-detect
|
| 25 |
# magic happens after the command line has been parsed.
|
| 26 |
- enabled linux || die "--enable-shared only supported on ELF for now"
|
| 27 |
+ if ! enabled linux; then
|
| 28 |
+ if enabled gnu; then
|
| 29 |
+ echo "--enable-shared is only supported on ELF; assuming this is OK"
|
| 30 |
+ else
|
| 31 |
+ die "--enable-shared only supported on ELF for now"
|
| 32 |
+ fi
|
| 33 |
+ fi
|
| 34 |
fi
|
| 35 |
if [ -z "$CC" ]; then
|
| 36 |
echo "Bypassing toolchain for environment detection."
|
| 37 |
--
|
| 38 |
1.7.9.7
|
| 39 |
|