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

Side by Side Diff: build/standalone.gypi

Issue 1217823003: Revert of Use third_party clang on Mac. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | no next file » | 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 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 ], 761 ],
762 }, 762 },
763 'conditions': [ 763 'conditions': [
764 ['werror==""', { 764 ['werror==""', {
765 'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'}, 765 'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'},
766 }, { 766 }, {
767 'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'}, 767 'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'},
768 }], 768 }],
769 ['clang==1', { 769 ['clang==1', {
770 'xcode_settings': { 770 'xcode_settings': {
771 'CC': '<(clang_dir)/bin/clang',
772 'LDPLUSPLUS': '<(clang_dir)/bin/clang++',
773 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 771 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
774 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x 772 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x
775 'CLANG_CXX_LIBRARY': 'libc++',
776 }, 773 },
777 }], 774 }],
778 ], 775 ],
779 'target_conditions': [ 776 'target_conditions': [
780 ['_type!="static_library"', { 777 ['_type!="static_library"', {
781 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 778 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
782 }], 779 }],
783 ], # target_conditions 780 ], # target_conditions
784 }, # target_defaults 781 }, # target_defaults
785 }], # OS=="mac" 782 }], # OS=="mac"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { 1039 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
1043 'make_global_settings': [ 1040 'make_global_settings': [
1044 ['CC_wrapper', '<(gomadir)/gomacc'], 1041 ['CC_wrapper', '<(gomadir)/gomacc'],
1045 ['CXX_wrapper', '<(gomadir)/gomacc'], 1042 ['CXX_wrapper', '<(gomadir)/gomacc'],
1046 ['CC.host_wrapper', '<(gomadir)/gomacc'], 1043 ['CC.host_wrapper', '<(gomadir)/gomacc'],
1047 ['CXX.host_wrapper', '<(gomadir)/gomacc'], 1044 ['CXX.host_wrapper', '<(gomadir)/gomacc'],
1048 ], 1045 ],
1049 }], 1046 }],
1050 ], 1047 ],
1051 } 1048 }
OLDNEW
« 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