gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix build breakage from 3fdd2a1

Browse Source 
Make sure the android_build variable is defined.
This commit is contained in:
Ben Noordhuis 2013-05-31 17:17:03 +02:00
parent 3fdd2a1128
commit eb1f60c022
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common.gypi
View File

@ -1,5 +1,6 @@
{
'variables': {
'android_build%': 0,
'visibility%': 'hidden', # V8's visibility setting
'target_arch%': 'ia32', # set v8's target architecture
'host_arch%': 'ia32', # set v8's host architecture
@ -8,13 +9,6 @@
'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way
'gcc_version%': 'unknown',
'clang%': 0,
'conditions': [
# Workaround for the legacy handling of android in gyp
['android_build == 1', {
'OS': 'android',
}],
],
},
'target_defaults': {
@ -136,7 +130,7 @@
}]
]
}],
['OS in "android freebsd linux openbsd solaris"', {
['OS in "freebsd linux openbsd solaris" or android_build == 1', {
'cflags': [ '-Wall' ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
'target_conditions': [
@ -156,7 +150,7 @@
'cflags': [ '-pthreads' ],
'ldflags': [ '-pthreads' ],
}],
[ 'OS not in "android solaris"', {
[ 'OS != "solaris" and android_build == 0', {
'cflags': [ '-pthread' ],
'ldflags': [ '-pthread' ],
}],

9
uv.gyp
View File

@ -1,5 +1,6 @@
{
'variables': {
'android_build%': 0,
'uv_use_dtrace%': 'false',
# uv_parent_path is the relative path to libuv in the parent project
# this is only relevant when dtrace is enabled and libuv is a child project
@ -21,7 +22,7 @@
['OS=="solaris"', {
'cflags': [ '-pthreads' ],
}],
['OS not in "android solaris"', {
['OS != "solaris" and android_build == 0', {
'cflags': [ '-pthread' ],
}],
],
@ -161,7 +162,7 @@
['OS=="solaris"', {
'ldflags': [ '-pthreads' ],
}],
['OS not in "android solaris"', {
['OS != "solaris" and android_build == 0', {
'ldflags': [ '-pthread' ],
}],
],
@ -179,7 +180,7 @@
}],
],
}],
[ 'OS in "android linux mac"', {
[ 'OS in "linux mac" or android_build == 1', {
'sources': [ 'src/unix/proctitle.c' ],
}],
[ 'OS=="mac"', {
@ -215,7 +216,7 @@
'libraries': [ '-ldl', '-lrt' ],
},
}],
[ 'OS=="android"', {
[ 'android_build == 1', {
'sources': [
'src/unix/linux-core.c',
'src/unix/linux-inotify.c',