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

Side by Side Diff: build/common.gypi

Issue 660118: Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | Annotate | Revision Log
« no previous file with comments | « build/build_config.h ('k') | chrome/app/chrome_exe_main_gtk.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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': { 9 'variables': {
10 # .gyp files or targets should set chromium_code to 1 if they build 10 # .gyp files or targets should set chromium_code to 1 if they build
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 # When building with shared libraries, remove the visiblity-hiding 941 # When building with shared libraries, remove the visiblity-hiding
942 # flag. 942 # flag.
943 'cflags!': [ '-fvisibility=hidden' ], 943 'cflags!': [ '-fvisibility=hidden' ],
944 'conditions': [ 944 'conditions': [
945 ['target_arch=="x64" or target_arch=="arm"', { 945 ['target_arch=="x64" or target_arch=="arm"', {
946 # Shared libraries need -fPIC on x86-64 and arm 946 # Shared libraries need -fPIC on x86-64 and arm
947 'cflags': ['-fPIC'] 947 'cflags': ['-fPIC']
948 }] 948 }]
949 ], 949 ],
950 }], 950 }],
951 ['linux_use_tcmalloc==1', { 951 ['linux_use_tcmalloc==0', {
952 'defines': ['LINUX_USE_TCMALLOC'], 952 'defines': ['NO_TCMALLOC'],
953 }], 953 }],
954 ], 954 ],
955 }, 955 },
956 }], 956 }],
957 # FreeBSD-specific options; note that most FreeBSD options are set above, 957 # FreeBSD-specific options; note that most FreeBSD options are set above,
958 # with Linux. 958 # with Linux.
959 ['OS=="freebsd"', { 959 ['OS=="freebsd"', {
960 'target_defaults': { 960 'target_defaults': {
961 'ldflags': [ 961 'ldflags': [
962 '-Wl,--no-keep-memory', 962 '-Wl,--no-keep-memory',
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 # and therefore SYMROOT, needs to be set at the project level. 1216 # and therefore SYMROOT, needs to be set at the project level.
1217 'SYMROOT': '<(DEPTH)/xcodebuild', 1217 'SYMROOT': '<(DEPTH)/xcodebuild',
1218 }, 1218 },
1219 } 1219 }
1220 1220
1221 # Local Variables: 1221 # Local Variables:
1222 # tab-width:2 1222 # tab-width:2
1223 # indent-tabs-mode:nil 1223 # indent-tabs-mode:nil
1224 # End: 1224 # End:
1225 # vim: set expandtab tabstop=2 shiftwidth=2: 1225 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | chrome/app/chrome_exe_main_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698