Skip to content

Commit

Permalink
build: don't link against liblog on host system
Browse files Browse the repository at this point in the history
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 authored and cjihrig committed Aug 10, 2016
1 parent 04ec64a commit ddf292f
Showing 1 changed file with 7 additions and 3 deletions.
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

0 comments on commit ddf292f

Please sign in to comment.