c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

zos: use gyp OS label "os390" on z/OS

Browse Source 
This is what `uname` on the system actually displays.
Also, other gyp based projects use 'os390'

PR-URL: https://github.com/libuv/libuv/pull/1207
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
John Barboza 2017-01-20 17:57:33 -05:00 committed by Ben Noordhuis
parent c722b8d278
commit c5bb773bdd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.gypi
View File

@ -35,7 +35,7 @@
'OTHER_CFLAGS': [ '-Wno-strict-aliasing' ], 'OTHER_CFLAGS': [ '-Wno-strict-aliasing' ],
}, },
'conditions': [ 'conditions': [
['OS != "zos"', { ['OS != "os390"', {
'cflags': [ '-O0', '-fwrapv' ] 'cflags': [ '-O0', '-fwrapv' ]
}], }],
['OS == "android"', { ['OS == "android"', {
@ -154,7 +154,7 @@
'cflags': [ '-pthreads' ], 'cflags': [ '-pthreads' ],
'ldflags': [ '-pthreads' ], 'ldflags': [ '-pthreads' ],
}], }],
[ 'OS not in "solaris android zos"', { [ 'OS not in "solaris android os390"', {
'cflags': [ '-pthread' ], 'cflags': [ '-pthread' ],
'ldflags': [ '-pthread' ], 'ldflags': [ '-pthread' ],
}], }],

24
uv.gyp
View File

@ -10,10 +10,10 @@
['OS=="solaris"', { ['OS=="solaris"', {
'cflags': [ '-pthreads' ], 'cflags': [ '-pthreads' ],
}], }],
['OS not in "solaris android zos"', { ['OS not in "solaris android os390"', {
'cflags': [ '-pthread' ], 'cflags': [ '-pthread' ],
}], }],
['OS in "zos"', { ['OS in "os390"', {
'defines': [ 'defines': [
'_UNIX03_THREADS', '_UNIX03_THREADS',
'_UNIX03_SOURCE', '_UNIX03_SOURCE',
@ -172,10 +172,10 @@
['OS=="solaris"', { ['OS=="solaris"', {
'ldflags': [ '-pthreads' ], 'ldflags': [ '-pthreads' ],
}], }],
[ 'OS=="zos" and uv_library=="shared_library"', { [ 'OS=="os390" and uv_library=="shared_library"', {
'ldflags': [ '-Wl,DLL' ], 'ldflags': [ '-Wl,DLL' ],
}], }],
['OS != "solaris" and OS != "android" and OS != "zos"', { ['OS != "solaris" and OS != "android" and OS != "os390"', {
'ldflags': [ '-pthread' ], 'ldflags': [ '-pthread' ],
}], }],
], ],
@ -183,14 +183,14 @@
'conditions': [ 'conditions': [
['uv_library=="shared_library"', { ['uv_library=="shared_library"', {
'conditions': [ 'conditions': [
['OS=="zos"', { ['OS=="os390"', {
'cflags': [ '-qexportall' ], 'cflags': [ '-qexportall' ],
}, { }, {
'cflags': [ '-fPIC' ], 'cflags': [ '-fPIC' ],
}], }],
], ],
}], }],
['uv_library=="shared_library" and OS!="mac" and OS!="zos"', { ['uv_library=="shared_library" and OS!="mac" and OS!="os390"', {
# This will cause gyp to set soname # This will cause gyp to set soname
# Must correspond with UV_VERSION_MAJOR # Must correspond with UV_VERSION_MAJOR
# in include/uv-version.h # in include/uv-version.h
@ -201,7 +201,7 @@
[ 'OS in "linux mac ios android"', { [ 'OS in "linux mac ios android"', {
'sources': [ 'src/unix/proctitle.c' ], 'sources': [ 'src/unix/proctitle.c' ],
}], }],
[ 'OS != "zos"', { [ 'OS != "os390"', {
'cflags': [ 'cflags': [
'-fvisibility=hidden', '-fvisibility=hidden',
'-g', '-g',
@ -224,7 +224,7 @@
'_DARWIN_UNLIMITED_SELECT=1', '_DARWIN_UNLIMITED_SELECT=1',
] ]
}], }],
[ 'OS!="mac" and OS!="zos"', { [ 'OS!="mac" and OS!="os390"', {
# Enable on all platforms except OS X. The antique gcc/clang that # Enable on all platforms except OS X. The antique gcc/clang that
# ships with Xcode emits waaaay too many false positives. # ships with Xcode emits waaaay too many false positives.
'cflags': [ '-Wstrict-aliasing' ], 'cflags': [ '-Wstrict-aliasing' ],
@ -304,7 +304,7 @@
['uv_library=="shared_library"', { ['uv_library=="shared_library"', {
'defines': [ 'BUILDING_UV_SHARED=1' ] 'defines': [ 'BUILDING_UV_SHARED=1' ]
}], }],
['OS=="zos"', { ['OS=="os390"', {
'sources': [ 'sources': [
'src/unix/pthread-fixes.c', 'src/unix/pthread-fixes.c',
'src/unix/pthread-barrier.c', 'src/unix/pthread-barrier.c',
@ -470,7 +470,7 @@
'test/runner-unix.h', 'test/runner-unix.h',
], ],
'conditions': [ 'conditions': [
[ 'OS != "zos"', { [ 'OS != "os390"', {
'defines': [ '_GNU_SOURCE' ], 'defines': [ '_GNU_SOURCE' ],
'cflags': [ '-Wno-long-long' ], 'cflags': [ '-Wno-long-long' ],
'xcode_settings': { 'xcode_settings': {
@ -499,7 +499,7 @@
['uv_library=="shared_library"', { ['uv_library=="shared_library"', {
'defines': [ 'USING_UV_SHARED=1' ], 'defines': [ 'USING_UV_SHARED=1' ],
'conditions': [ 'conditions': [
[ 'OS == "zos"', { [ 'OS == "os390"', {
'cflags': [ '-Wc,DLL' ], 'cflags': [ '-Wc,DLL' ],
}], }],
], ],
@ -560,7 +560,7 @@
['uv_library=="shared_library"', { ['uv_library=="shared_library"', {
'defines': [ 'USING_UV_SHARED=1' ], 'defines': [ 'USING_UV_SHARED=1' ],
'conditions': [ 'conditions': [
[ 'OS == "zos"', { [ 'OS == "os390"', {
'cflags': [ '-Wc,DLL' ], 'cflags': [ '-Wc,DLL' ],
}], }],
], ],