diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1665600..79995f2 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)', |