move lto condition into existing condition statement.

BUG=354
TESTED=gclient runhooks
R=fdegans@chromium.org

Review URL: https://webrtc-codereview.appspot.com/17209004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1062 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-08-25 19:12:50 +00:00
parent c2a78ebf45
commit 6fb3ed37f5
3 changed files with 14 additions and 16 deletions

View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1061
Version: 1062
License: BSD
License File: LICENSE

View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1061
#define LIBYUV_VERSION 1062
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

View File

@ -47,11 +47,18 @@
'-mfpu=vfpv3-d16',
],
'conditions': [
['target_arch != "arm64"', {
'cflags': [
'-mfpu=neon',
],
}],
['target_arch != "arm64"', {
'cflags': [
'-mfpu=neon',
],
}],
# Disable LTO in libyuv_neon target due to gcc 4.9 compiler bug.
['use_lto == 1', {
'cflags!': [
'-flto',
'-ffat-lto-objects',
],
}],
],
'include_dirs': [
'include',
@ -72,15 +79,6 @@
'source/scale_neon.cc',
'source/scale_neon64.cc',
],
'conditions': [
# Disable LTO in libyuv_neon target due to compiler bug
['use_lto == 1', {
'cflags!': [
'-flto',
'-ffat-lto-objects',
],
}],
],
},
],
}],