[third_party_packages] Remove -flto from Python.
Was being optimistic :(
TBR=iannucci@chromium.org
BUG=chromium:714852
TEST=expectations
Change-Id: I8f63b02e85e65f9e35b13857d737ac37ec9bf669
Reviewed-on: https://chromium-review.googlesource.com/513782
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
diff --git a/recipes/recipes/third_party_packages.expected/mac_failure.json b/recipes/recipes/third_party_packages.expected/mac_failure.json
index 9962853..3b2cf7b 100644
--- a/recipes/recipes/third_party_packages.expected/mac_failure.json
+++ b/recipes/recipes/third_party_packages.expected/mac_failure.json
@@ -485,9 +485,8 @@
],
"cwd": "[START_DIR]/python/checkout",
"env": {
- "CFLAGS": "-flto",
"CPPFLAGS": "-I[START_DIR]/_support/prefix/include",
- "LDFLAGS": "-L[START_DIR]/_support/prefix/lib -flto",
+ "LDFLAGS": "-L[START_DIR]/_support/prefix/lib",
"MACOSX_DEPLOYMENT_TARGET": "10.6",
"ac_cv_func_clock_gettime": "n",
"ac_cv_func_getentropy": "n"
diff --git a/recipes/recipes/third_party_packages.expected/new_python_on_linux-386.json b/recipes/recipes/third_party_packages.expected/new_python_on_linux-386.json
index 1c5d0fc..789a1b2 100644
--- a/recipes/recipes/third_party_packages.expected/new_python_on_linux-386.json
+++ b/recipes/recipes/third_party_packages.expected/new_python_on_linux-386.json
@@ -413,9 +413,8 @@
],
"cwd": "[START_DIR]/python/checkout",
"env": {
- "CFLAGS": "-flto",
"CPPFLAGS": "-I[START_DIR]/_support/prefix/include",
- "LDFLAGS": "-L[START_DIR]/_support/prefix/lib -flto"
+ "LDFLAGS": "-L[START_DIR]/_support/prefix/lib"
},
"name": "python.configure",
"~followup_annotations": [
diff --git a/recipes/recipes/third_party_packages.expected/new_python_on_linux-amd64.json b/recipes/recipes/third_party_packages.expected/new_python_on_linux-amd64.json
index 37424e8..6a34a7a 100644
--- a/recipes/recipes/third_party_packages.expected/new_python_on_linux-amd64.json
+++ b/recipes/recipes/third_party_packages.expected/new_python_on_linux-amd64.json
@@ -413,9 +413,8 @@
],
"cwd": "[START_DIR]/python/checkout",
"env": {
- "CFLAGS": "-flto",
"CPPFLAGS": "-I[START_DIR]/_support/prefix/include",
- "LDFLAGS": "-L[START_DIR]/_support/prefix/lib -flto"
+ "LDFLAGS": "-L[START_DIR]/_support/prefix/lib"
},
"name": "python.configure",
"~followup_annotations": [
diff --git a/recipes/recipes/third_party_packages.expected/new_python_on_mac-amd64.json b/recipes/recipes/third_party_packages.expected/new_python_on_mac-amd64.json
index 7c9c54c..8ca168d 100644
--- a/recipes/recipes/third_party_packages.expected/new_python_on_mac-amd64.json
+++ b/recipes/recipes/third_party_packages.expected/new_python_on_mac-amd64.json
@@ -485,9 +485,8 @@
],
"cwd": "[START_DIR]/python/checkout",
"env": {
- "CFLAGS": "-flto",
"CPPFLAGS": "-I[START_DIR]/_support/prefix/include",
- "LDFLAGS": "-L[START_DIR]/_support/prefix/lib -flto",
+ "LDFLAGS": "-L[START_DIR]/_support/prefix/lib",
"MACOSX_DEPLOYMENT_TARGET": "10.6",
"ac_cv_func_clock_gettime": "n",
"ac_cv_func_getentropy": "n"
diff --git a/recipes/recipes/third_party_packages.py b/recipes/recipes/third_party_packages.py
index 117a1b7..37b540a 100644
--- a/recipes/recipes/third_party_packages.py
+++ b/recipes/recipes/third_party_packages.py
@@ -222,17 +222,12 @@
cppflags = [
'-I%s' % (support_include,),
]
- cflags = [
- '-flto',
- ]
ldflags = [
'-L%s' % (support_lib,),
- '-flto',
]
configure_env = {
'CPPFLAGS': ' '.join(cppflags),
- 'CFLAGS': ' '.join(cflags),
'LDFLAGS': ' '.join(ldflags),
}
configure_flags = [
