Skip to content
Snippets Groups Projects
Commit 47deeb6d authored by benl@chromium.org's avatar benl@chromium.org
Browse files

OpenBSD defines.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34829 0039d316-1c4b-4281-b951-d872f2087c98
parent f8605d2c
No related branches found
No related tags found
No related merge requests found
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
}], }],
], ],
}], }],
['OS=="linux" or OS=="freebsd"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [ 'dependencies': [
'../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
'../tools/xdisplaycheck/xdisplaycheck.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
......
...@@ -43,12 +43,9 @@ ...@@ -43,12 +43,9 @@
// For access to standard POSIXish features, use OS_POSIX instead of a // For access to standard POSIXish features, use OS_POSIX instead of a
// more specific macro. // more specific macro.
#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
#define OS_POSIX 1 #define OS_POSIX 1
#endif
// Use base::DataPack for name/value pairs. // Use base::DataPack for name/value pairs.
#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
#define USE_BASE_DATA_PACK 1 #define USE_BASE_DATA_PACK 1
#endif #endif
......
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
'arm_thumb%': 0, 'arm_thumb%': 0,
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# This will set gcc_version to XY if you are running gcc X.Y.*. # This will set gcc_version to XY if you are running gcc X.Y.*.
# This is used to tweak build flags for gcc 4.4. # This is used to tweak build flags for gcc 4.4.
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
'use_titlecase_in_grd_files%': 1, 'use_titlecase_in_grd_files%': 1,
}], }],
], ],
}], # OS=="linux" or OS=="freebsd" }], # OS=="linux" or OS=="freebsd" or OS=="openbsd"
['OS=="mac"', { ['OS=="mac"', {
# Mac wants Title Case strings # Mac wants Title Case strings
'use_titlecase_in_grd_files%': 1, 'use_titlecase_in_grd_files%': 1,
...@@ -531,13 +531,16 @@ ...@@ -531,13 +531,16 @@
}, },
}, },
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'target_defaults': { 'target_defaults': {
# Enable -Werror by default, but put it in a variable so it can # Enable -Werror by default, but put it in a variable so it can
# be disabled in ~/.gyp/include.gypi on the valgrind builders. # be disabled in ~/.gyp/include.gypi on the valgrind builders.
'variables': { 'variables': {
'werror%': '-Werror',
'no_strict_aliasing%': 0, 'no_strict_aliasing%': 0,
'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
['OS=="freebsd"', {'werror%': '',}],
['OS=="openbsd"', {'werror%': '',}],
],
}, },
'cflags': [ 'cflags': [
'<(werror)', # See note above about the werror variable. '<(werror)', # See note above about the werror variable.
...@@ -1004,7 +1007,7 @@ ...@@ -1004,7 +1007,7 @@
['exclude', '/(cocoa|mac)/'], ['exclude', '/(cocoa|mac)/'],
['exclude', '\.mm$' ] ], ['exclude', '\.mm$' ] ],
}], }],
['OS!="linux" and OS!="freebsd"', { ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
'sources/': [ 'sources/': [
['exclude', '_(chromeos|gtk|linux|x|x11)(_unittest)?\\.cc$'], ['exclude', '_(chromeos|gtk|linux|x|x11)(_unittest)?\\.cc$'],
['exclude', '/gtk/'], ['exclude', '/gtk/'],
...@@ -1016,7 +1019,7 @@ ...@@ -1016,7 +1019,7 @@
}], }],
# Though Skia is conceptually shared by Linux and Windows, # Though Skia is conceptually shared by Linux and Windows,
# the only _skia files in our tree are Linux-specific. # the only _skia files in our tree are Linux-specific.
['OS!="linux" and OS!="freebsd"', { ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
'sources/': [ ['exclude', '_skia\\.cc$'] ], 'sources/': [ ['exclude', '_skia\\.cc$'] ],
}], }],
['chromeos!=1', { ['chromeos!=1', {
...@@ -1028,7 +1031,8 @@ ...@@ -1028,7 +1031,8 @@
], ],
}, },
}], }],
['disable_nacl==1', { # Disable native client on FreeBSD/OpenBSD for now
['disable_nacl==1 or OS=="freebsd" or OS=="openbsd"', {
'target_defaults': { 'target_defaults': {
'defines': [ 'defines': [
'DISABLE_NACL', 'DISABLE_NACL',
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
{ {
'conditions': [ 'conditions': [
[ 'OS=="linux" or OS=="freebsd"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'target_defaults': { 'target_defaults': {
'cflags!': [ 'cflags!': [
'-Wall', '-Wall',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment