Skip to content

Commit 41e27f6

Browse files
bnoordhuisMylesBorins
authored andcommitted
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 924ea0a commit 41e27f6

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
@@ -293,9 +293,13 @@
293293
}],
294294
],
295295
}],
296-
[ 'OS=="android"', {
297-
'defines': ['_GLIBCXX_USE_C99_MATH'],
298-
'libraries': [ '-llog' ],
296+
['OS=="android"', {
297+
'target_conditions': [
298+
['_toolset=="target"', {
299+
'defines': [ '_GLIBCXX_USE_C99_MATH' ],
300+
'libraries': [ '-llog' ],
301+
}],
302+
],
299303
}],
300304
['OS=="mac"', {
301305
'defines': ['_DARWIN_USE_64_BIT_INODE=1'],

0 commit comments

Comments
 (0)