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

Unified Diff: gyp/common_conditions.gypi

Issue 23281003: Add libraries to fix Ubuntu13 Clang build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
===================================================================
--- gyp/common_conditions.gypi (revision 10793)
+++ gyp/common_conditions.gypi (working copy)
@@ -247,13 +247,15 @@
'-pthread',
],
},
+ }, { # skia_os != "nacl"
+ 'link_settings': {
+ 'ldflags': [
+ '-lstdc++',
+ '-lm',
+ ],
+ },
}],
- [ 'skia_os == "chromeos"', {
- 'ldflags': [
- '-lstdc++',
- '-lm',
- ],
- }, {
+ [ 'skia_os != "chromeos"', {
'conditions': [
[ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
'cflags': [
« 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