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

Unified Diff: ports/ffmpeg/build.sh

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 8 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
Index: ports/ffmpeg/build.sh
diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
index d2f3c3f017f6adde13a3e4561dff7d0a7d325578..d22e241e923c52a44c44f358a9c07ff2b64f7eba 100644
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@@ -12,13 +12,15 @@ ConfigureStep() {
SetupCrossEnvironment
local extra_args=""
- if [ "${TOOLCHAIN}" = "pnacl" ]; then
+ if [ "${TOOLCHAIN}" = "pnacl" -a "${NACL_ARCH}" != "le32" ]; then
extra_args="--cc=pnacl-clang"
+ elif [ "${TOOLCHAIN}" = "pnacl" -a "${NACL_ARCH}" = "le32" ]; then
+ extra_args="--cc=${CC}"
elif [ "${TOOLCHAIN}" = "clang-newlib" ]; then
extra_args="--cc=${CC}"
fi
- if [ "${NACL_ARCH}" = "pnacl" ]; then
+ if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "le32" ]; then
extra_args+=" --arch=pnacl"
elif [ "${NACL_ARCH}" = "arm" ]; then
extra_args+=" --arch=arm"
« make_all.sh ('K') | « ports/dosbox/build.sh ('k') | ports/ffmpeg/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698