From 8264380738475a9f04fbb7b870fa4adcc701daf9 Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Fri, 11 Oct 2013 16:55:08 -0300 Subject: [PATCH] Configure: added special osname checks for nto and android When cross-compiling, for android, anything matching *linux-android* gets osname=linux-androideabi. This is to allow compiling to all three android variants (x86, arm, mips). For QNX Neutrino, anything matching nto*|*-nto-* gets osname=nto. In the future, that might change to 'qnx', but right now we don't want it to pick up the hints file. For anything else, keep the current behavior, which is to set osname to the output of `echo $targetarch|sed 's,^[^-]*-,,'` --- Configure | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure index 71fa2d2..7fc99b5 100755 --- a/Configure +++ b/Configure @@ -3541,7 +3541,19 @@ EOM case "$targetarch" in '') ;; *) hostarch=$osname - osname=`echo $targetarch|sed 's,^[^-]*-,,'` + case "$targetarch" in + nto*|*-nto-*) + osname=nto + ;; + *linux-android*) + # Catch arm-linux-androideabi, mipsel-linux-android, + # and i686-linux-android + osname=linux-android + ;; + *) + osname=`echo $targetarch|sed 's,^[^-]*-,,'` + ;; + esac osvers='' ;; esac -- 2.7.4