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

Unified Diff: crypto/crypto.gyp

Issue 7055003: Last gyp patch for cross-platform Unix support (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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
Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 88863a1173343663dc79a4526fed3b22588abdd8..e662e5269297f9628b33aacf30437d6462335259 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -18,7 +18,7 @@
4018,
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+ [ 'os_posix == 1 and OS != "mac"', {
'conditions': [
[ 'chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -38,7 +38,7 @@
}
],
],
- }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+ }, { # os_posix != 1 or OS == "mac"
'sources/': [
['exclude', '_nss\.cc$'],
],
@@ -192,7 +192,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+ [ 'os_posix == 1 and OS != "mac"', {
'conditions': [
[ 'linux_use_tcmalloc==1', {
'dependencies': [
@@ -204,7 +204,7 @@
'dependencies': [
'../build/linux/system.gyp:nss',
],
- }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+ }, { # os_posix != 1 or OS == "mac"
'sources!': [
'rsa_private_key_nss_unittest.cc',
]
« no previous file with comments | « courgette/courgette.gyp ('k') | gpu/demos/demos.gyp » ('j') | printing/printing.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698