summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 00:35:15 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 00:35:15 +0000
commit93f21e4ceb7b2bda9d50657cce47f2e640e567b5 (patch)
tree701675d956c23c5bd600141342b867a411bd1a2c /build
parent466cd64ae3c3550a5c5695a6d5fa8f9ab47f2456 (diff)
downloadchromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.zip
chromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.tar.gz
chromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.tar.bz2
Solaris: various edits towards compiling Chromium on Solaris. Changed __Solaris__ to __sun. Defined NAME_MAX as MAXNAMLEN for systems where it is undefined.
BUG=30101 TEST=compiles Patch by James Choi <jchoi42 at pha.jhu.edu> Review URL: http://codereview.chromium.org/652166 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/build_config.h2
-rw-r--r--build/common.gypi9
2 files changed, 7 insertions, 4 deletions
diff --git a/build/build_config.h b/build/build_config.h
index 154f237..c0a7bee 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -32,7 +32,7 @@
#elif defined(__OpenBSD__)
#define OS_OPENBSD 1
#define TOOLKIT_GTK
-#elif defined(__Solaris__)
+#elif defined(__sun)
#define OS_SOLARIS 1
#define TOOLKIT_GTK
#else
diff --git a/build/common.gypi b/build/common.gypi
index 6774034..6db0932 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -689,7 +689,7 @@
},
},
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': {
# Enable -Werror by default, but put it in a variable so it can
# be disabled in ~/.gyp/include.gypi on the valgrind builders.
@@ -996,6 +996,10 @@
],
},
}],
+ ['OS=="solaris"', {
+ 'cflags!': ['-fvisibility=hidden'],
+ 'cflags_cc!': ['-fvisibility-inlines-hidden'],
+ }],
['OS=="mac"', {
'target_defaults': {
'variables': {
@@ -1170,8 +1174,7 @@
},
},
}],
- # Disable native client on FreeBSD/OpenBSD for now
- ['disable_nacl==1 or OS=="freebsd" or OS=="openbsd"', {
+ ['disable_nacl==1 or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': {
'defines': [
'DISABLE_NACL',