Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <anna@addaleax.net>
  • Loading branch information
bnoordhuis committed Aug 1, 2016
commit 6945aa7085f97c5902c042df99de772136d08ee7
10 changes: 7 additions & 3 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,13 @@
}],
],
}],
[ 'OS=="android"', {
'defines': ['_GLIBCXX_USE_C99_MATH'],
'libraries': [ '-llog' ],
['OS=="android"', {
'target_conditions': [
['_toolset=="target"', {
'defines': [ '_GLIBCXX_USE_C99_MATH' ],
'libraries': [ '-llog' ],
}],
],
}],
['OS=="mac"', {
'defines': ['_DARWIN_USE_64_BIT_INODE=1'],
Expand Down