summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-19 00:47:04 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-19 00:47:04 +0000
commit610d8cc4f841d33ddff06d575e93f2e437d079b0 (patch)
treedb6f7cdc2562038d06ecb64d33668e9b4c6fd107 /build
parentba009cd324efd8d2fd82d4e2cbe941b238cf952d (diff)
downloadchromium_src-610d8cc4f841d33ddff06d575e93f2e437d079b0.zip
chromium_src-610d8cc4f841d33ddff06d575e93f2e437d079b0.tar.gz
chromium_src-610d8cc4f841d33ddff06d575e93f2e437d079b0.tar.bz2
No-op .gypi change to force GYP to run via the DEPS hook. This should get
the straggler bots back to green. They must have missed a GYP run while gclient was broken earlier. Review URL: http://codereview.chromium.org/211037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi12
1 files changed, 9 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 23b5173..9f8d28a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -456,9 +456,15 @@
# TODO(sgk): investigate handling this not by re-ordering the
# flags this way, but by adding a hook to use the SCons
# ParseFlags() option on the output from pkg-config.
- 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
- 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SHLINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
- 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
+ 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET',
+ '$_LIBDIRFLAGS', '$LINKFLAGS', '$SOURCES',
+ '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
+ 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET',
+ '$_LIBDIRFLAGS', '$SHLINKFLAGS', '$SOURCES',
+ '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
+ 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET',
+ '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES',
+ '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
'IMPLICIT_COMMAND_DEPENDENCIES': 0,
# -rpath is only used when building with shared libraries.
'conditions': [