Skip to content

Commit 6945aa7

Browse files
committed
build: don't link against liblog on host system
Don't link binaries that run on the host system against liblog, it breaks cross-compiling for android. Fixes: #7731 PR-URL: #7762 Reviewed-By: Anna Henningsen <[email protected]>
1 parent c8c1f96 commit 6945aa7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

common.gypi

+7-3
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,13 @@
301301
}],
302302
],
303303
}],
304-
[ 'OS=="android"', {
305-
'defines': ['_GLIBCXX_USE_C99_MATH'],
306-
'libraries': [ '-llog' ],
304+
['OS=="android"', {
305+
'target_conditions': [
306+
['_toolset=="target"', {
307+
'defines': [ '_GLIBCXX_USE_C99_MATH' ],
308+
'libraries': [ '-llog' ],
309+
}],
310+
],
307311
}],
308312
['OS=="mac"', {
309313
'defines': ['_DARWIN_USE_64_BIT_INODE=1'],

0 commit comments

Comments
 (0)