Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 48787ec5cbf03c993b03a41bf1b3457064d1f7f7..37eac0cefe2ed6e89c7f10843352f495ccc9d4c0 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -38,14 +38,16 @@ |
# Compute the architecture that we're building on. |
'conditions': [ |
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
# This handles the Linux platforms we generally deal with. Anything |
# else gets passed through, which probably won't work very well; such |
# hosts should pass an explicit target_arch to gyp. |
'host_arch%': |
- '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")', |
- }, { # OS!="linux" |
+ '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', |
+ 'os_posix%': 1, |
Mark Mentovai
2011/05/09 19:54:50
Now we’re getting into a semantic difference thing
|
+ }, { # OS!=posix |
'host_arch%': 'ia32', |
+ 'os_posix%': 0, |
}], |
# Set default value of toolkit_views on for Windows, Chrome OS |
@@ -64,6 +66,7 @@ |
'host_arch%': '<(host_arch)', |
'library%': '<(library)', |
'toolkit_views%': '<(toolkit_views)', |
+ 'os_posix%': '<(os_posix)', |
# Override branding to select the desired branding flavor. |
'branding%': 'Chromium', |
@@ -185,6 +188,7 @@ |
'target_arch%': '<(target_arch)', |
'host_arch%': '<(host_arch)', |
'toolkit_views%': '<(toolkit_views)', |
+ 'os_posix%': '<(os_posix)', |
'use_gnome_keyring%': '<(use_gnome_keyring)', |
'linux_fpic%': '<(linux_fpic)', |
'enable_flapper_hacks%': '<(enable_flapper_hacks)', |
@@ -405,7 +409,7 @@ |
'icu_src_dir': '../third_party/icu', |
'conditions': [ |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
+ ['os_posix==1', { |
# 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. |
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', |
@@ -421,7 +425,7 @@ |
'linux_dump_symbols%': 1, |
}], |
], |
- }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" |
+ }], # os_posix==1 |
['OS=="mac"', { |
'conditions': [ |
@@ -483,7 +487,7 @@ |
], |
}], |
- ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', { |
+ ['OS=="mac" or (os_posix==1 and chromeos==0 and target_arch!="arm")', { |
'use_cups%': 1, |
}, { |
'use_cups%': 0, |
@@ -732,7 +736,7 @@ |
'target_conditions': [ |
['chromium_code==0', { |
'conditions': [ |
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
+ [ 'os_posix==1', { |
# We don't want to get warnings from third-party code, |
# so remove any existing warning-enabling flags like -Wall. |
'cflags!': [ |
@@ -788,7 +792,7 @@ |
['exclude', '(^|/)(cocoa|mac)/'], |
['exclude', '\\.mm?$' ] ], |
}], |
- ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { |
+ ['os_posix!=1', { |
'sources/': [ |
['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.(h|cc)$'], |
['exclude', '(^|/)gtk/'], |
@@ -1023,7 +1027,7 @@ |
}, |
}, |
'conditions': [ |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['os_posix==1', { |
'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. |
@@ -1033,6 +1037,7 @@ |
'conditions': [['OS=="linux"', {'werror%': '-Werror',}], |
['OS=="freebsd"', {'werror%': '',}], |
['OS=="openbsd"', {'werror%': '',}], |
+ ['OS=="solaris"', {'werror%': '',}], |
tony
2011/05/09 20:13:18
Nit: Can we put freebsd/openbsd/solaris in the els
|
], |
}, |
'cflags': [ |
@@ -1626,7 +1631,7 @@ |
}, |
}, |
}], |
- ['disable_nacl==1 or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['disable_nacl==1', { |
tony
2011/05/09 20:13:18
This looks like a functional change. Looks like i
|
'target_defaults': { |
'defines': [ |
'DISABLE_NACL', |