diff options
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1665600..9f87a44 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -93,6 +93,14 @@ }, { 'use_gnome_keyring%': 1, }], + + # Set to 1 compile with -fPIC cflag on linux. This is a must for shared + # libraries on linux x86-64 and arm. + ['host_arch=="ia32"', { + 'linux_fpic%': 0, + }, { + 'linux_fpic%': 1, + }], ], 'host_arch%': '<(host_arch)', @@ -101,7 +109,7 @@ # building on. 'target_arch%': '<(host_arch)', - # Copy conditionally-set chromeos and touchui variables out one scope. + # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', @@ -114,10 +122,6 @@ # compilation. 'fastbuild%': 0, - # Set to 1 compile with -fPIC cflag on linux. This is a must for shared - # libraries on linux x86-64 and arm. - 'linux_fpic%': 0, - # Python version. 'python_ver%': '2.5', @@ -154,11 +158,11 @@ 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', 'use_gnome_keyring%': '<(use_gnome_keyring)', + 'linux_fpic%': '<(linux_fpic)', 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', 'inside_chromium_build%': '<(inside_chromium_build)', 'fastbuild%': '<(fastbuild)', - 'linux_fpic%': '<(linux_fpic)', 'python_ver%': '<(python_ver)', 'armv7%': '<(armv7)', 'arm_neon%': '<(arm_neon)', @@ -310,7 +314,7 @@ # whether to compile in the sources for the GPU plugin / process. 'enable_gpu%': 1, - # Use OpenSSL instead of NSS. Currently in developement. + # Use OpenSSL instead of NSS. Currently in development. 'use_openssl%': 0, 'conditions': [ @@ -497,6 +501,11 @@ 'ENABLE_GPU=1', ], }], + ['use_openssl==1', { + 'defines': [ + 'USE_OPENSSL=1', + ], + }], ['enable_eglimage==1', { 'defines': [ 'ENABLE_EGLIMAGE=1', @@ -982,6 +991,11 @@ '-Wl,--gc-sections', ], }], + ['clang==1', { + 'cflags!': [ + '-fno-ident', + ], + }], ] }, }, @@ -1134,6 +1148,10 @@ '-Wno-bool-conversions', # Don't die on dtoa code that uses a char as an array index. '-Wno-char-subscripts', + # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see + # http://code.google.com/p/googletest/source/detail?r=446 . + # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ). + '-Wno-unnamed-type-template-args', ], 'cflags!': [ # Clang doesn't seem to know know this flag. @@ -1242,6 +1260,10 @@ # Don't die on dtoa code that uses a char as an array index. # This is required solely for base/third_party/dmg_fp/dtoa.cc. '-Wno-char-subscripts', + # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see + # http://code.google.com/p/googletest/source/detail?r=446 . + # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ). + '-Wno-unnamed-type-template-args', ], }], ], |