Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ddf292f

Browse filesBrowse files
bnoordhuiscjihrig
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 <anna@addaleax.net>
1 parent 04ec64a commit ddf292f
Copy full SHA for ddf292f

File tree

Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+7-3Lines changed: 7 additions & 3 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.