OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright 2008, Google Inc. | 2 # Copyright 2008, Google Inc. |
3 # All rights reserved. | 3 # All rights reserved. |
4 # | 4 # |
5 # Redistribution and use in source and binary forms, with or without | 5 # Redistribution and use in source and binary forms, with or without |
6 # modification, are permitted provided that the following conditions are | 6 # modification, are permitted provided that the following conditions are |
7 # met: | 7 # met: |
8 # | 8 # |
9 # * Redistributions of source code must retain the above copyright | 9 # * Redistributions of source code must retain the above copyright |
10 # notice, this list of conditions and the following disclaimer. | 10 # notice, this list of conditions and the following disclaimer. |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 '-fno-strict-aliasing', | 90 '-fno-strict-aliasing', |
91 '-Wno-missing-field-initializers' | 91 '-Wno-missing-field-initializers' |
92 ], | 92 ], |
93 'xcode_settings': { | 93 'xcode_settings': { |
94 'WARNING_CFLAGS': [ | 94 'WARNING_CFLAGS': [ |
95 '-fno-strict-aliasing', | 95 '-fno-strict-aliasing', |
96 '-Wno-missing-field-initializers' | 96 '-Wno-missing-field-initializers' |
97 ] | 97 ] |
98 }, | 98 }, |
99 'conditions': [ | 99 'conditions': [ |
100 ['OS=="linux"', { | 100 ['OS=="linux" or OS=="mac"', { |
101 'sources': [ | 101 'sources': [ |
102 'linux/nacl_desc_sysv_shm.c', | |
103 'linux/nacl_desc_sysv_shm.h', | |
104 'posix/nacl_desc.c', | 102 'posix/nacl_desc.c', |
105 ], | 103 ], |
106 }], | 104 }], |
107 ['OS=="mac"', { | 105 ['OS=="mac"', { |
108 'sources': [ | |
109 'posix/nacl_desc.c', | |
110 ], | |
111 # Turning -pedantic off is a hack. Without it, clang | 106 # Turning -pedantic off is a hack. Without it, clang |
112 # complains that macro arguments are empty, which is | 107 # complains that macro arguments are empty, which is |
113 # only permitted in c99 and c++0x modes. This is true | 108 # only permitted in c99 and c++0x modes. This is true |
114 # even when DYNAMIC_ANNOTATIONS_ENABLED is 0 (see | 109 # even when DYNAMIC_ANNOTATIONS_ENABLED is 0 (see |
115 # base/third_party/dynamic_annotations/dynamic_annotations.h). | 110 # base/third_party/dynamic_annotations/dynamic_annotations.h). |
116 # We really should split nacl_desc_wrapper.{cc,h} into its | 111 # We really should split nacl_desc_wrapper.{cc,h} into its |
117 # own library to isolate the build warning relaxation to just | 112 # own library to isolate the build warning relaxation to just |
118 # that one file. Of course, any dependent of nacl_desc_wrapper.h | 113 # that one file. Of course, any dependent of nacl_desc_wrapper.h |
119 # will also need this. | 114 # will also need this. |
120 'conditions': [ | 115 'conditions': [ |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 }, | 246 }, |
252 'dependencies': [ | 247 'dependencies': [ |
253 # 'nrd_xfer', | 248 # 'nrd_xfer', |
254 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', | 249 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', |
255 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', | 250 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', |
256 '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_base', | 251 '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_base', |
257 ], | 252 ], |
258 }, | 253 }, |
259 ], | 254 ], |
260 } | 255 } |
OLD | NEW |