| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'libcxx_proxy', | 8 'target_name': 'libcxx_proxy', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'toolsets': ['host', 'target'], | 10 'toolsets': ['host', 'target'], |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 'trunk/src/thread.cpp', | 81 'trunk/src/thread.cpp', |
| 82 'trunk/src/typeinfo.cpp', | 82 'trunk/src/typeinfo.cpp', |
| 83 'trunk/src/utility.cpp', | 83 'trunk/src/utility.cpp', |
| 84 'trunk/src/valarray.cpp', | 84 'trunk/src/valarray.cpp', |
| 85 ], | 85 ], |
| 86 'include_dirs': [ | 86 'include_dirs': [ |
| 87 'trunk/include', | 87 'trunk/include', |
| 88 '../libc++abi/trunk/include', | 88 '../libc++abi/trunk/include', |
| 89 ], | 89 ], |
| 90 'cflags': [ | 90 'cflags': [ |
| 91 '-fPIC', |
| 91 '-fstrict-aliasing', | 92 '-fstrict-aliasing', |
| 92 '-nostdinc++', | 93 '-nostdinc++', |
| 94 '-pthread', |
| 93 '-std=c++11', | 95 '-std=c++11', |
| 94 ], | 96 ], |
| 95 'cflags_cc!': [ | 97 'cflags_cc!': [ |
| 96 '-fno-exceptions', | 98 '-fno-exceptions', |
| 97 '-fno-rtti', | 99 '-fno-rtti', |
| 98 ], | 100 ], |
| 99 'cflags!': [ | 101 'cflags!': [ |
| 100 '-fvisibility=hidden', | 102 '-fvisibility=hidden', |
| 101 ], | 103 ], |
| 102 'ldflags': [ | 104 'ldflags': [ |
| 103 '-nodefaultlibs', | 105 '-nodefaultlibs', |
| 104 ], | 106 ], |
| 105 'ldflags!': [ | 107 'ldflags!': [ |
| 106 # This somehow causes a warning from clang about an unused compilation | 108 # -nodefaultlibs turns -pthread into a no-op, causing an unused argument |
| 107 # option. Use '-lpthread' instead. | 109 # warning. Explicitly link with -lpthread instead. |
| 108 # TODO(earthdok): find out what's causing the warning. | |
| 109 '-pthread', | 110 '-pthread', |
| 110 ], | 111 ], |
| 111 'libraries': [ | 112 'libraries': [ |
| 112 '-lc', | 113 '-lc', |
| 113 '-lgcc_s', | 114 '-lgcc_s', |
| 115 '-lm', |
| 114 '-lpthread', | 116 '-lpthread', |
| 115 '-lrt', | 117 '-lrt', |
| 116 ], | 118 ], |
| 117 }, | 119 }, |
| 118 ] | 120 ] |
| 119 } | 121 } |
| OLD | NEW |