Index: src/untrusted/pthread/pthread.gyp |
=================================================================== |
--- src/untrusted/pthread/pthread.gyp (revision 8118) |
+++ src/untrusted/pthread/pthread.gyp (working copy) |
@@ -18,45 +18,40 @@ |
'../valgrind/dynamic_annotations.c', |
], |
}, |
- 'conditions': [ |
- # NOTE: We do not support untrusted gyp build on arm yet. |
- ['target_arch!="arm"', { |
- 'targets' : [ |
- { |
- 'target_name': 'pthread_lib', |
- 'type': 'none', |
- 'variables': { |
- 'nlib_target': 'libpthread.a', |
- 'build_glibc': 0, |
- 'build_newlib': 1, |
- 'sources': ['<@(common_sources)'] |
- }, |
- 'dependencies': [ |
- '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
- ], |
- }, |
- { |
- 'target_name': 'pthreadb_private_lib', |
- 'type': 'none', |
- 'variables': { |
- 'nlib_target': 'libpthread_private.a', |
- 'build_glibc': 0, |
- 'build_newlib': 1, |
- 'sources': [ |
- '<@(common_sources)', |
- 'nc_init_private.c', |
- '../irt/irt_blockhook.c', |
- '../irt/irt_cond.c', |
- '../irt/irt_mutex.c', |
- '../irt/irt_sem.c', |
- ], |
- }, |
- 'dependencies': [ |
- '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
- 'pthread_lib' |
- ], |
- }, |
+ 'targets' : [ |
+ { |
+ 'target_name': 'pthread_lib', |
+ 'type': 'none', |
+ 'variables': { |
+ 'nlib_target': 'libpthread.a', |
+ 'build_glibc': 0, |
+ 'build_newlib': 1, |
+ 'sources': ['<@(common_sources)'] |
+ }, |
+ 'dependencies': [ |
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
], |
- }], |
+ }, |
+ { |
+ 'target_name': 'pthreadb_private_lib', |
+ 'type': 'none', |
+ 'variables': { |
+ 'nlib_target': 'libpthread_private.a', |
+ 'build_glibc': 0, |
+ 'build_newlib': 1, |
+ 'sources': [ |
+ '<@(common_sources)', |
+ 'nc_init_private.c', |
+ '../irt/irt_blockhook.c', |
+ '../irt/irt_cond.c', |
+ '../irt/irt_mutex.c', |
+ '../irt/irt_sem.c', |
+ ], |
+ }, |
+ 'dependencies': [ |
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
+ 'pthread_lib' |
+ ], |
+ }, |
], |
} |