summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-08 21:38:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-08 21:38:12 +0200
commit0472c5f8a1f1d267bad6c3418a1d071c4824f285 (patch)
treec1005939fe0f24a4cf4bf9c7f10170d107bea377 /configure
parenta698efbc9df3c6e503f395f040f5170de3f5cb85 (diff)
parent0026e356d044e72b6e743b234708b8b8af457ac0 (diff)
Merge commit '0026e356d044e72b6e743b234708b8b8af457ac0'
* commit '0026e356d044e72b6e743b234708b8b8af457ac0': configure: Die if gas is unavailable under aarch64 as well as ARM Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 65fdd15b5e..57977a1937 100755
--- a/configure
+++ b/configure
@@ -4363,7 +4363,7 @@ EOF
}
if enabled asm; then
- enabled arm aarch64 && nogas=die
+ enabled_any arm aarch64 && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
if ! check_gas ; then