summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp22
-rw-r--r--chrome/service/cloud_print/print_system_cups.cc1
2 files changed, 16 insertions, 7 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 961d908..b1e8ebb 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1165,12 +1165,6 @@
],
}],
['use_cups==1', {
- 'link_settings': {
- 'libraries': [
- '-lcups',
- '-lgcrypt',
- ],
- },
'defines': [
# CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
# of cloud print system, and allows to use custom implementaiton.
@@ -1179,6 +1173,22 @@
'sources': [
'service/cloud_print/print_system_cups.cc',
],
+ 'conditions': [
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/usr/lib/libcups.dylib',
+ ]
+ },
+ }, {
+ 'link_settings': {
+ 'libraries': [
+ '-lcups',
+ '-lgcrypt',
+ ],
+ },
+ }],
+ ],
}],
['remoting==1', {
'dependencies': [
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 99e3d1d..12548af 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -7,7 +7,6 @@
#include <cups/cups.h>
#include <dlfcn.h>
#include <errno.h>
-#include <gcrypt.h>
#include <pthread.h>
#include <list>