Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: net/third_party/nss/ssl.gyp

Issue 1159083004: Speculative revert to fix ChromeOS PFQ mips builder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@speciulative_mips_fix
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | third_party/harfbuzz-ng/harfbuzz.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl.gyp
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
index c09f306208e58291b06efa587a29f78bb59db106..1d2bab8c8ebf90187fb255e3c2f3b9fdb41d3859 100644
--- a/net/third_party/nss/ssl.gyp
+++ b/net/third_party/nss/ssl.gyp
@@ -3,6 +3,22 @@
# found in the LICENSE file.
{
+ 'conditions': [
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
+ 'conditions': [
+ ['sysroot!=""', {
+ 'variables': {
+ 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
+ },
+ }, {
+ 'variables': {
+ 'pkg-config': 'pkg-config'
+ },
+ }],
+ ],
+ }],
+ ],
+
'targets': [
{
'target_name': 'libssl',
« no previous file with comments | « media/media.gyp ('k') | third_party/harfbuzz-ng/harfbuzz.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698