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

Side by Side Diff: build/common.gypi

Issue 12095046: gyp: do not force stack protector on Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix up comment Created 7 years, 10 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 | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after
2365 'Release_x64': { 2365 'Release_x64': {
2366 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 2366 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
2367 }, 2367 },
2368 }], 2368 }],
2369 ], 2369 ],
2370 }, 2370 },
2371 }, 2371 },
2372 'conditions': [ 2372 'conditions': [
2373 ['os_posix==1', { 2373 ['os_posix==1', {
2374 'target_defaults': { 2374 'target_defaults': {
2375 'cflags': [
2376 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc
2377 # supports it.
2378 '-fstack-protector',
2379 '--param=ssp-buffer-size=4',
2380 ],
2381 'ldflags': [ 2375 'ldflags': [
2382 '-Wl,-z,now', 2376 '-Wl,-z,now',
2383 '-Wl,-z,relro', 2377 '-Wl,-z,relro',
2384 ], 2378 ],
2385 }, 2379 },
2386 }], 2380 }],
2381 ['os_posix==1 and chromeos==0', {
2382 # Chrome OS enables -fstack-protector-strong via its build wrapper,
2383 # and we want to avoid overriding this, so stack-protector is only
2384 # enabled when not building on Chrome OS.
2385 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc
2386 # supports it.
2387 'target_defaults': {
2388 'cflags': [
2389 '-fstack-protector',
2390 '--param=ssp-buffer-size=4',
2391 ],
2392 },
2393 }],
2387 ['os_posix==1 and OS!="mac" and OS!="ios"', { 2394 ['os_posix==1 and OS!="mac" and OS!="ios"', {
2388 'target_defaults': { 2395 'target_defaults': {
2389 # Enable -Werror by default, but put it in a variable so it can 2396 # Enable -Werror by default, but put it in a variable so it can
2390 # be disabled in ~/.gyp/include.gypi on the valgrind builders. 2397 # be disabled in ~/.gyp/include.gypi on the valgrind builders.
2391 'variables': { 2398 'variables': {
2392 'werror%': '-Werror', 2399 'werror%': '-Werror',
2393 'libraries_for_target%': '', 2400 'libraries_for_target%': '',
2394 }, 2401 },
2395 'defines': [ 2402 'defines': [
2396 '_FILE_OFFSET_BITS=64', 2403 '_FILE_OFFSET_BITS=64',
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
3986 # settings in target dicts. SYMROOT is a special case, because many other 3993 # settings in target dicts. SYMROOT is a special case, because many other
3987 # Xcode variables depend on it, including variables such as 3994 # Xcode variables depend on it, including variables such as
3988 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3995 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3989 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3996 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3990 # files to appear (when present) in the UI as actual files and not red 3997 # files to appear (when present) in the UI as actual files and not red
3991 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3998 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3992 # and therefore SYMROOT, needs to be set at the project level. 3999 # and therefore SYMROOT, needs to be set at the project level.
3993 'SYMROOT': '<(DEPTH)/xcodebuild', 4000 'SYMROOT': '<(DEPTH)/xcodebuild',
3994 }, 4001 },
3995 } 4002 }
OLDNEW
« 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