Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: pylib/gyp/generator/make.py

Issue 2870040: Temporarily turn off ARFLAGS detection to work around a gold bug. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: '' Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/generator/make.py
===================================================================
--- pylib/gyp/generator/make.py (revision 834)
+++ pylib/gyp/generator/make.py (working copy)
@@ -125,13 +125,18 @@
LINK.target ?= $(LINK)
LDFLAGS.target ?= $(LDFLAGS)
AR.target ?= $(AR)
-# We don't want to run the detection multiple times. So, we
+# We detect arflags at compile-time (see detect_arflags above), but we
+# don't want to run the detection multiple times. So, we
# - use $(obj).target/arflags/arflags.target.mk as the cache of the detection,
# - use := to avoid the right hand side multiple times, and
# - use ifeq instead of ?= because ?= is like ifeq and =, not ifeq and := .
-include $(obj).target/arflags/arflags.mk
ifeq ($(ARFLAGS.target),)
- ARFLAGS.target := $(call detect_arflags,target)
+ # Temporarily disabling detect_arflags call due to a bug in gold with the
+ # detected flag.
+ # TODO(evan): reenable this once there is a release of gold > 2.20.1.
+ # ARFLAGS.target := $(call detect_arflags,target)
+ ARFLAGS.target := crs
endif
CC.host ?= gcc
@@ -144,7 +149,9 @@
# See the description for ARFLAGS.target.
-include $(obj).host/arflags/arflags.mk
ifeq ($(ARFLAGS.host),)
- ARFLAGS.host := $(call detect_arflags,host)
+ # Temporarily disabled -- see ARFLAGS.target.
+ # ARFLAGS.host := $(call detect_arflags,host)
+ ARFLAGS.host := crs
endif
# Flags to make gcc output dependency info. Note that you need to be
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698