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

Side by Side Diff: base/base.gyp

Issue 1699713002: Fix "undefined reference to '__atomic_is_lock_free'" errors on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix use_sysroot for gyp Created 4 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 | « base/BUILD.gn ('k') | build/common.gypi » ('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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'NO_TCMALLOC', 132 'NO_TCMALLOC',
133 ], 133 ],
134 'direct_dependent_settings': { 134 'direct_dependent_settings': {
135 'defines': [ 135 'defines': [
136 'NO_TCMALLOC', 136 'NO_TCMALLOC',
137 ], 137 ],
138 }, 138 },
139 }], 139 }],
140 ], 140 ],
141 }], 141 }],
142 ['use_sysroot==0 and (OS == "android" or OS == "linux")', {
143 'link_settings': {
144 'libraries': [
145 # Needed for <atomic> when building with newer C++ library.
146 '-latomic',
147 ],
148 },
149 }],
142 ['OS == "win"', { 150 ['OS == "win"', {
143 # Specify delayload for base.dll. 151 # Specify delayload for base.dll.
144 'msvs_settings': { 152 'msvs_settings': {
145 'VCLinkerTool': { 153 'VCLinkerTool': {
146 'DelayLoadDLLs': [ 154 'DelayLoadDLLs': [
147 'cfgmgr32.dll', 155 'cfgmgr32.dll',
148 'powrprof.dll', 156 'powrprof.dll',
149 'setupapi.dll', 157 'setupapi.dll',
150 ], 158 ],
151 'AdditionalDependencies': [ 159 'AdditionalDependencies': [
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 '../build/isolate.gypi', 1677 '../build/isolate.gypi',
1670 ], 1678 ],
1671 'sources': [ 1679 'sources': [
1672 'base_unittests.isolate', 1680 'base_unittests.isolate',
1673 ], 1681 ],
1674 }, 1682 },
1675 ], 1683 ],
1676 }], 1684 }],
1677 ], 1685 ],
1678 } 1686 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698