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

Side by Side Diff: build/common.gypi

Issue 67212: Fixes to make shared build work for app (chrome) target on linux. (Closed)
Patch Set: merge with HEAD Created 11 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 # require --{start,end}-group. There has been a lot of 208 # require --{start,end}-group. There has been a lot of
209 # refactoring since this was first coded, which might have 209 # refactoring since this was first coded, which might have
210 # eliminated the circular dependencies. 210 # eliminated the circular dependencies.
211 # 211 #
212 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS 212 # Note: $_LIBDIRFLAGS comes before ${LINK,SHLINK,LDMODULE}FLAGS
213 # so that we prefer our own built libraries (e.g. -lpng) to 213 # so that we prefer our own built libraries (e.g. -lpng) to
214 # system versions of libraries that pkg-config might turn up. 214 # system versions of libraries that pkg-config might turn up.
215 # TODO(sgk): investigate handling this not by re-ordering the 215 # TODO(sgk): investigate handling this not by re-ordering the
216 # flags this way, but by adding a hook to use the SCons 216 # flags this way, but by adding a hook to use the SCons
217 # ParseFlags() option on the output from pkg-config. 217 # ParseFlags() option on the output from pkg-config.
218 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LINKFL AGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
219 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SH LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 218 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$SH LINKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
220 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-grou p']], 219 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LDMODULEFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-grou p']],
221 'IMPLICIT_COMMAND_DEPENDENCIES': 0, 220 'IMPLICIT_COMMAND_DEPENDENCIES': 0,
221 # rpath is only used when doing a shared build
222 'conditions': [
223 [ 'library=="shared_library"', {
224 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LI NKFLAGS', '$SOURCES', '-Wl,-rpath', '-Wl,$LIB_DIR', '-Wl,--start-group', '$_LIBF LAGS', '-Wl,--end-group']],
225 }, { # else: library!="shared_library"
226 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$_LIBDIRFLAGS', '$LI NKFLAGS', '$SOURCES', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
227 }],
228 ],
222 }, 229 },
223 'scons_import_variables': [ 230 'scons_import_variables': [
224 'CC', 231 'CC',
225 'CXX', 232 'CXX',
226 'LINK', 233 'LINK',
227 ], 234 ],
228 'scons_propagate_variables': [ 235 'scons_propagate_variables': [
229 'CC', 236 'CC',
230 'CCACHE_DIR', 237 'CCACHE_DIR',
231 'CXX', 238 'CXX',
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 # settings in target dicts. SYMROOT is a special case, because many other 425 # settings in target dicts. SYMROOT is a special case, because many other
419 # Xcode variables depend on it, including variables such as 426 # Xcode variables depend on it, including variables such as
420 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 427 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
421 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 428 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
422 # files to appear (when present) in the UI as actual files and not red 429 # files to appear (when present) in the UI as actual files and not red
423 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 430 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
424 # and therefore SYMROOT, needs to be set at the project level. 431 # and therefore SYMROOT, needs to be set at the project level.
425 'SYMROOT': '<(DEPTH)/xcodebuild', 432 'SYMROOT': '<(DEPTH)/xcodebuild',
426 }, 433 },
427 } 434 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698