Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index e58abb2d7d1b22dbe891c91d375a2811dbf5fa71..9723b5dfc5350b449b8227d55910eb5defcf9ede 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2268,7 +2268,7 @@ |
'libraries': [ |
'-l<(android_stlport_library)', |
# Manually link the libgcc.a that the cross compiler uses. |
- '<!($CROSS_CC -print-libgcc-file-name)', |
+ '<!(/bin/echo -n $LIBGCC_FILE_NAME)', |
'-lc', |
'-ldl', |
'-lstdc++', |
@@ -2874,7 +2874,7 @@ |
], |
}, |
}], |
- ['clang==1', { |
+ ['clang==1 and OS!="android"', { |
'make_global_settings': [ |
['CC', '<(make_clang_dir)/bin/clang'], |
['CXX', '<(make_clang_dir)/bin/clang++'], |
@@ -2884,6 +2884,18 @@ |
['LINK.host', '$(LINK)'], |
], |
}], |
+ ['OS=="android" and "<(GENERATOR)"!="ninja"', { |
+ # make generator needs these variables at gyp time |
Ami GONE FROM CHROMIUM
2012/03/14 17:13:18
This is incorrect. The generated Makefile will ta
bulach
2012/03/14 17:36:43
sorry, the comment wasn't clear.
we're doing this
|
+ # in order to hardcode the compiler names into the Makefile. |
+ 'make_global_settings': [ |
+ ['CC', '<!(/bin/echo -n $CROSS_CC)'], |
+ ['CXX', '<!(/bin/echo -n $CROSS_CXX)'], |
+ ['LINK', '<!(/bin/echo -n $CROSS_LINK)'], |
+ ['CC.host', '<!(/bin/echo -n $HOST_CC)'], |
+ ['CXX.host', '<!(/bin/echo -n $HOST_CXX)'], |
+ ['LINK.host', '<!(/bin/echo -n $HOST_LINK)'], |
+ ], |
+ }], |
], |
'xcode_settings': { |
# DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! |