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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 EXECUTABLES="ffmpeg ffmpeg_g ffprobe ffprobe_g" 5 EXECUTABLES="ffmpeg ffmpeg_g ffprobe ffprobe_g"
6 6
7 # needed for RLIMIT_CPU 7 # needed for RLIMIT_CPU
8 EnableGlibcCompat 8 EnableGlibcCompat
9 9
10 ConfigureStep() { 10 ConfigureStep() {
11 11
12 SetupCrossEnvironment 12 SetupCrossEnvironment
13 13
14 local extra_args="" 14 local extra_args=""
15 if [ "${TOOLCHAIN}" = "pnacl" ]; then 15 if [ "${TOOLCHAIN}" = "pnacl" -a "${NACL_ARCH}" != "le32" ]; then
16 extra_args="--cc=pnacl-clang" 16 extra_args="--cc=pnacl-clang"
17 elif [ "${TOOLCHAIN}" = "pnacl" -a "${NACL_ARCH}" = "le32" ]; then
18 extra_args="--cc=${CC}"
17 elif [ "${TOOLCHAIN}" = "clang-newlib" ]; then 19 elif [ "${TOOLCHAIN}" = "clang-newlib" ]; then
18 extra_args="--cc=${CC}" 20 extra_args="--cc=${CC}"
19 fi 21 fi
20 22
21 if [ "${NACL_ARCH}" = "pnacl" ]; then 23 if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "le32" ]; then
22 extra_args+=" --arch=pnacl" 24 extra_args+=" --arch=pnacl"
23 elif [ "${NACL_ARCH}" = "arm" ]; then 25 elif [ "${NACL_ARCH}" = "arm" ]; then
24 extra_args+=" --arch=arm" 26 extra_args+=" --arch=arm"
25 else 27 else
26 extra_args+=" --arch=x86" 28 extra_args+=" --arch=x86"
27 fi 29 fi
28 30
29 LogExecute ${SRC_DIR}/configure \ 31 LogExecute ${SRC_DIR}/configure \
30 --cross-prefix=${NACL_CROSS_PREFIX}- \ 32 --cross-prefix=${NACL_CROSS_PREFIX}- \
31 --target-os=linux \ 33 --target-os=linux \
(...skipping 15 matching lines...) Expand all
47 --disable-demuxer=rtsp \ 49 --disable-demuxer=rtsp \
48 --disable-demuxer=image2 \ 50 --disable-demuxer=image2 \
49 --prefix=${PREFIX} \ 51 --prefix=${PREFIX} \
50 ${extra_args} 52 ${extra_args}
51 } 53 }
52 54
53 TestStep() { 55 TestStep() {
54 SetupCrossPaths 56 SetupCrossPaths
55 LogExecute make testprogs 57 LogExecute make testprogs
56 } 58 }
OLDNEW
« 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