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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1437173002: Target Mac bots at 10.7+libc++ to approximate Chrome's 10.6+libc++. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: skdiff Created 5 years, 1 month 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 | gyp/tools.gyp » ('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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 # specifically requested. These should be temporary staging defines. Any 381 # specifically requested. These should be temporary staging defines. Any
382 # permanent defines should be moved into the skia_android_framework block 382 # permanent defines should be moved into the skia_android_framework block
383 # above. 383 # above.
384 'includes' : [ 384 'includes' : [
385 'skia_for_android_framework_defines.gypi', 385 'skia_for_android_framework_defines.gypi',
386 ], 386 ],
387 'defines': [ 387 'defines': [
388 '<@(skia_for_android_framework_defines)', 388 '<@(skia_for_android_framework_defines)',
389 ], 389 ],
390 }], 390 }],
391 391
392 [ 'skia_use_sdl == 1', 392 [ 'skia_use_sdl == 1',
393 { 393 {
394 'defines': [ 'SK_USE_SDL' ], 394 'defines': [ 'SK_USE_SDL' ],
395 }], 395 }],
396 396
397 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', 397 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
398 { 398 {
399 'defines': [ 399 'defines': [
400 'SK_SAMPLES_FOR_X', 400 'SK_SAMPLES_FOR_X',
401 'SK_BUILD_FOR_UNIX', 401 'SK_BUILD_FOR_UNIX',
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 'defines': [ 'NDEBUG' ], 489 'defines': [ 'NDEBUG' ],
490 }, 490 },
491 }, 491 },
492 'xcode_settings': { 492 'xcode_settings': {
493 'conditions': [ 493 'conditions': [
494 [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ], 494 [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ],
495 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }], 495 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
496 [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }], 496 [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }],
497 [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }], 497 [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
498 [ 'skia_osx_deployment_target==""', { 498 [ 'skia_osx_deployment_target==""', {
499 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld. 499 'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
500 }, { 500 }, {
501 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', 501 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
502 }], 502 }],
503 ], 503 ],
504 'CLANG_CXX_LIBRARY': 'libc++',
504 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 505 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
505 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions 506 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
506 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 507 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
507 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics 508 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics
508 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 509 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3
509 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden 510 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden
510 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden 511 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden
511 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks 512 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks
512 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings 513 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings
513 'WARNING_CFLAGS': [ 514 'WARNING_CFLAGS': [
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], 638 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
638 }, 639 },
639 }], 640 }],
640 641
641 ], # end 'conditions' 642 ], # end 'conditions'
642 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 643 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
643 'xcode_settings': { 644 'xcode_settings': {
644 'SYMROOT': '<(DEPTH)/xcodebuild', 645 'SYMROOT': '<(DEPTH)/xcodebuild',
645 }, 646 },
646 } 647 }
OLDNEW
« no previous file with comments | « no previous file | gyp/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698