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
29
30
31
32
33
34
35
36
|
diff --git a/build/common.gypi.orig b/build/common.gypi
index cce7b3c..3b905c0 100644
--- a/build/common.gypi.orig
+++ b/build/common.gypi
@@ -6096,7 +6096,7 @@
'target_conditions': [
['_toolset=="target"', {
'ldflags': [
- '-flto=32',
+ '-flto=4'
],
}],
],
@@ -6248,7 +6248,7 @@
},
}],
# TODO(pcc): Make these flags work correctly with CFI.
- ['use_lto!=0 and cfi_vptr==0', {
+ ['use_lto!=0 and cfi_vptr==0 and clang==1', {
'target_defaults': {
'target_conditions': [
['_toolset=="target"', {
diff --git a/build/android/disable_gcc_lto.gypi.orig b/build/android/disable_gcc_lto.gypi
index a733c7a..57570f8 100644
--- a/build/android/disable_gcc_lto.gypi.orig
+++ b/build/android/disable_gcc_lto.gypi
@@ -8,7 +8,7 @@
'target_conditions': [
['_toolset=="target"', {
'conditions': [
- ['OS=="android" and clang==0 and (use_lto==1 or use_lto_o2==1)', {
+ ['(OS=="android" or OS=="linux") and clang==0 and (use_lto==1 or use_lto_o2==1)', {
'cflags!': [
'-flto',
'-ffat-lto-objects',
|
GitWeb
