Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: common.gypi

Issue 10807048: Updated patch for mac/android xcompile Base URL: http://src.chromium.org/svn/trunk/src/build/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« android/envsetup.sh ('K') | « android/envsetup.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: common.gypi
===================================================================
--- common.gypi (revision 143348)
+++ common.gypi (working copy)
@@ -814,9 +814,13 @@
# 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)',
- # Figure out the python architecture to decide if we build pyauto.
- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
'conditions': [
Torne 2012/08/01 11:28:51 Break this out into a separate conditions section
+ ['HOST_OS!="mac"', {
+ # Figure out the python architecture to decide if we build pyauto.
+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
+ }],
+ ],
+ 'conditions': [
['branding=="Chrome"', {
'linux_breakpad%': 1,
}],
@@ -3102,7 +3106,7 @@
['LINK.host', '$(LINK)'],
],
}],
- ['OS=="android" and "<(GENERATOR)"!="ninja"', {
+ ['OS=="android" and "<(GENERATOR)"!="ninja" and HOST_OS!="mac"', {
# Hardcode the compiler names in the Makefile so that
# it won't depend on the environment at make time.
'make_global_settings': [
@@ -3114,6 +3118,19 @@
['LINK.host', '<!(which g++)'],
],
}],
+ ['OS=="android" and "<(GENERATOR)"!="ninja"', {
+ 'make_global_settings': [
+ ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
+ ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],
+ ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
+ ['AR', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-ar)'],
+ ['LD', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-ld)'],
+ ['RANLIB', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-ranlib)'],
+ ['CC.host', '<!(which gcc)'],
+ ['CXX.host', '<!(which g++)'],
Torne 2012/08/01 11:28:51 Don't duplicate setting these to the same thing. W
luke.weber 2012/08/07 12:25:51 Disclaimer here, I'm building webrtc and libjingle
+ ['LINK.host', '<!(which g++)'],
+ ],
+ }],
],
'xcode_settings': {
# DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
« android/envsetup.sh ('K') | « android/envsetup.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698