OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'includes': [ | 6 'includes': [ |
7 '../../../build/common.gypi', | 7 '../../../build/common.gypi', |
8 ], | 8 ], |
9 'variables': { | 9 'variables': { |
10 'irt_sources': [ | 10 'irt_sources': [ |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 }, | 112 }, |
113 'sources': ['<@(irt_sources)', '<@(irt_browser)'], | 113 'sources': ['<@(irt_sources)', '<@(irt_browser)'], |
114 'include_dirs': ['../../../../ppapi'], | 114 'include_dirs': ['../../../../ppapi'], |
115 'conditions': [ | 115 'conditions': [ |
116 ['target_arch == "x64" or target_arch == "ia32"', { | 116 ['target_arch == "x64" or target_arch == "ia32"', { |
117 'link_flags': [ | 117 'link_flags': [ |
118 '-r', | 118 '-r', |
119 '-nostartfiles', | 119 '-nostartfiles', |
120 ], | 120 ], |
121 }], | 121 }], |
122 ['target_arch == "arm"', { | |
123 'compile_flags': [ | |
124 '-mtp=soft' | |
Derek Schuff
2013/03/28 17:33:41
seems odd that this is here for arm but the corres
Roland McGrath
2013/03/28 17:37:54
See newlib_tls_flags in untrusted.gypi; that uses
Derek Schuff
2013/03/28 17:49:31
Got it. so this should only be here, and in whatev
Sam Clegg
2013/03/28 23:02:59
Done. Went for consistency with x86 which is to s
| |
125 ], | |
126 }], | |
122 ], | 127 ], |
123 'dependencies': [ | 128 'dependencies': [ |
124 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 129 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
125 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', | 130 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', |
126 ], | 131 ], |
127 }, | 132 }, |
128 ], | 133 ], |
129 } | 134 } |
OLD | NEW |