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

Side by Side Diff: build/common.gypi

Issue 9427013: Merge r10739 and r10752 into 3.8 branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.8
Patch Set: Created 8 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 | « no previous file | src/elements.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 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 }, 269 },
270 'conditions': [ 270 'conditions': [
271 ['OS=="freebsd" or OS=="openbsd"', { 271 ['OS=="freebsd" or OS=="openbsd"', {
272 'cflags': [ '-I/usr/local/include' ], 272 'cflags': [ '-I/usr/local/include' ],
273 }], 273 }],
274 ['OS=="netbsd"', { 274 ['OS=="netbsd"', {
275 'cflags': [ '-I/usr/pkg/include' ], 275 'cflags': [ '-I/usr/pkg/include' ],
276 }], 276 }],
277 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { 277 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
278 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', 278 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
279 '-Wnon-virtual-dtor' ], 279 '-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
280 }], 280 }],
281 ], 281 ],
282 }, # Debug 282 }, # Debug
283 'Release': { 283 'Release': {
284 'conditions': [ 284 'conditions': [
285 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ 285 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
286 or OS=="android"', { 286 or OS=="android"', {
287 'cflags!': [ 287 'cflags!': [
288 '-O2', 288 '-O2',
289 '-Os', 289 '-Os',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 # some test cases can cause stack overflow. 353 # some test cases can cause stack overflow.
354 # 'StackReserveSize': '297152', 354 # 'StackReserveSize': '297152',
355 }, 355 },
356 }, 356 },
357 }], # OS=="win" 357 }], # OS=="win"
358 ], # conditions 358 ], # conditions
359 }, # Release 359 }, # Release
360 }, # configurations 360 }, # configurations
361 }, # target_defaults 361 }, # target_defaults
362 } 362 }
OLDNEW
« no previous file with comments | « no previous file | src/elements.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698