Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
|
Nikita (slow)
2011/12/12 08:59:17
I've though that you were disabling NaCL during in
| |
| 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 'include': [ | 6 'include': [ |
| 7 '../native_client/build/untrusted.gypi', | 7 '../native_client/build/untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'variables': { | 10 'variables': { |
| 11 'nacl_target': 0, | 11 'nacl_target': 0, |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 155 'include_dirs': [ | 155 'include_dirs': [ |
| 156 '..', | 156 '..', |
| 157 ], | 157 ], |
| 158 'dependencies': [ | 158 'dependencies': [ |
| 159 'nacl', | 159 'nacl', |
| 160 ], | 160 ], |
| 161 'sources': [ | 161 'sources': [ |
| 162 'nacl/nacl_helper_linux.cc', | 162 'nacl/nacl_helper_linux.cc', |
| 163 ], | 163 ], |
| 164 'conditions': [ | 164 'conditions': [ |
| 165 ['order_profiling != 0', { | |
| 166 'target_conditions' : [ | |
| 167 ['_toolset=="target"', { | |
| 168 'cflags!': [ '-finstrument-functions' ], | |
| 169 }], | |
| 170 ], | |
| 171 }], | |
| 165 ['toolkit_uses_gtk == 1', { | 172 ['toolkit_uses_gtk == 1', { |
| 166 'dependencies': [ | 173 'dependencies': [ |
| 167 '../build/linux/system.gyp:gtk', | 174 '../build/linux/system.gyp:gtk', |
| 168 ], | 175 ], |
| 169 }], | 176 }], |
| 170 ['use_glib == 1', { | 177 ['use_glib == 1', { |
| 171 'dependencies': [ | 178 'dependencies': [ |
| 172 '../build/linux/system.gyp:glib', | 179 '../build/linux/system.gyp:glib', |
| 173 ], | 180 ], |
| 174 }], | 181 }], |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 203 # al. Though a program built that way can indeed run on the | 210 # al. Though a program built that way can indeed run on the |
| 204 # x86-64 host, we cannot reliably build this program on such a | 211 # x86-64 host, we cannot reliably build this program on such a |
| 205 # host because Ubuntu does not provide the full suite of | 212 # host because Ubuntu does not provide the full suite of |
| 206 # x86-32 libraries in packages that can be installed on an | 213 # x86-32 libraries in packages that can be installed on an |
| 207 # x86-64 host; in particular, libelf is missing. So here we | 214 # x86-64 host; in particular, libelf is missing. So here we |
| 208 # use the hack of eliding all the -m* flags from the | 215 # use the hack of eliding all the -m* flags from the |
| 209 # compilation lines, getting the command close to what they | 216 # compilation lines, getting the command close to what they |
| 210 # would be if gyp were to really build properly for the host. | 217 # would be if gyp were to really build properly for the host. |
| 211 # TODO(bradnelson): Clean up with proper cross support. | 218 # TODO(bradnelson): Clean up with proper cross support. |
| 212 'conditions': [ | 219 'conditions': [ |
| 220 ['order_profiling != 0', { | |
| 221 'target_conditions' : [ | |
| 222 ['_toolset=="target"', { | |
| 223 'cflags!': [ '-finstrument-functions' ], | |
| 224 }], | |
| 225 ], | |
| 226 }], | |
| 213 ['host_arch=="x64"', { | 227 ['host_arch=="x64"', { |
| 214 'cflags/': [['exclude', '-m.*']], | 228 'cflags/': [['exclude', '-m.*']], |
| 215 'ldflags/': [['exclude', '-m.*']], | 229 'ldflags/': [['exclude', '-m.*']], |
| 216 }], | 230 }], |
| 217 ], | 231 ], |
| 218 }, | 232 }, |
| 219 { | 233 { |
| 220 'target_name': 'nacl_helper_bootstrap_lib', | 234 'target_name': 'nacl_helper_bootstrap_lib', |
| 221 'type': 'static_library', | 235 'type': 'static_library', |
| 222 'product_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 236 'product_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 241 '-fno-pic', '-fno-PIC', | 255 '-fno-pic', '-fno-PIC', |
| 242 '-fno-pie', '-fno-PIE', | 256 '-fno-pie', '-fno-PIE', |
| 243 ], | 257 ], |
| 244 'cflags!': [ | 258 'cflags!': [ |
| 245 # TODO(glider): -fasan is deprecated. | 259 # TODO(glider): -fasan is deprecated. |
| 246 '-fasan', | 260 '-fasan', |
| 247 '-faddress-sanitizer', | 261 '-faddress-sanitizer', |
| 248 '-w', | 262 '-w', |
| 249 ], | 263 ], |
| 250 'conditions': [ | 264 'conditions': [ |
| 265 ['order_profiling != 0', { | |
| 266 'target_conditions' : [ | |
| 267 ['_toolset=="target"', { | |
| 268 'cflags!': [ '-finstrument-functions' ], | |
| 269 }], | |
| 270 ], | |
| 271 }], | |
| 251 ['clang==1', { | 272 ['clang==1', { |
| 252 'cflags': [ | 273 'cflags': [ |
| 253 # Prevent llvm-opt from replacing my_bzero with a call | 274 # Prevent llvm-opt from replacing my_bzero with a call |
| 254 # to memset | 275 # to memset |
| 255 '-ffreestanding', | 276 '-ffreestanding', |
| 256 # But make its <limits.h> still work! | 277 # But make its <limits.h> still work! |
| 257 '-U__STDC_HOSTED__', '-D__STDC_HOSTED__=1', | 278 '-U__STDC_HOSTED__', '-D__STDC_HOSTED__=1', |
| 258 ], | 279 ], |
| 259 }], | 280 }], |
| 260 ], | 281 ], |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 365 'target_name': 'nacl_win64', | 386 'target_name': 'nacl_win64', |
| 366 'type': 'none', | 387 'type': 'none', |
| 367 'sources': [], | 388 'sources': [], |
| 368 }, | 389 }, |
| 369 ], | 390 ], |
| 370 }], | 391 }], |
| 371 ], | 392 ], |
| 372 }], | 393 }], |
| 373 ], | 394 ], |
| 374 } | 395 } |
| OLD | NEW |