generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkg-config-wrapper should not be run when build_nss is disabled (=0).

Browse Source 
BUG=b/15411893
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12839004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6538 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-06-25 20:14:13 +00:00
parent 3b84b3a58c
commit 4ddcc40d32
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/base/base.gyp
View File

@ -577,14 +577,22 @@
'-lX11',
'-lXcomposite',
'-lXrender',
'<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
},
'cflags': [
'<!@(<(pkg-config) --cflags nss)',
],
'ldflags': [
'<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
'conditions': [
['build_ssl==1', {
'link_settings': {
'libraries': [
'<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
},
'cflags': [
'<!@(<(pkg-config) --cflags nss)',
],
'ldflags': [
'<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
],
}],
],
}, {
'sources!': [