summaryrefslogtreecommitdiff
path: root/build/make/configure.sh
diff options
context:
space:
mode:
authorKO Myung-Hun <komh@chollian.net>2014-07-22 11:09:27 +0900
committerJohann <johannkoenig@google.com>2014-07-29 18:41:52 -0700
commit07fa6adfe173f2465da71f321fee27bf4a0440b9 (patch)
tree8828c7ca47c87ebe8a7b6bedf674153871d2488d /build/make/configure.sh
parent2926d24478891dfc57d8e8e14535990a27757599 (diff)
downloadlibvpx-07fa6adfe173f2465da71f321fee27bf4a0440b9.tar
libvpx-07fa6adfe173f2465da71f321fee27bf4a0440b9.tar.gz
libvpx-07fa6adfe173f2465da71f321fee27bf4a0440b9.tar.bz2
libvpx-07fa6adfe173f2465da71f321fee27bf4a0440b9.zip
Remove 'local' from configure and configure.sh
'local' is not posix. Change-Id: I46d7acfa574cbef686cee1b35022f5781485c3fa
Diffstat (limited to 'build/make/configure.sh')
-rw-r--r--[-rwxr-xr-x]build/make/configure.sh32
1 files changed, 20 insertions, 12 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh
index d25f31333..6bc8509ab 100755..100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -381,8 +381,8 @@ EOF
# tests for -m$1 toggling the feature given in $2. If $2 is empty $1 is used.
check_gcc_machine_option() {
- local opt="$1"
- local feature="$2"
+ opt="$1"
+ feature="$2"
[ -n "$feature" ] || feature="$opt"
if enabled gcc && ! disabled "$feature" && ! check_cflags "-m$opt"; then
@@ -419,8 +419,8 @@ true
}
write_common_target_config_mk() {
- local CC="${CC}"
- local CXX="${CXX}"
+ saved_CC="${CC}"
+ saved_CXX="${CXX}"
enabled ccache && CC="ccache ${CC}"
enabled ccache && CXX="ccache ${CXX}"
print_webm_license $1 "##" ""
@@ -470,6 +470,8 @@ EOF
enabled msvs && echo "CONFIG_VS_VERSION=${vs_version}" >> "${1}"
+ CC="${saved_CC}"
+ CXX="${saved_CXX}"
}
@@ -1314,8 +1316,9 @@ process_toolchain() {
}
print_config_mk() {
- local prefix=$1
- local makefile=$2
+ saved_prefix="${prefix}"
+ prefix=$1
+ makefile=$2
shift 2
for cfg; do
if enabled $cfg; then
@@ -1323,11 +1326,13 @@ print_config_mk() {
echo "${prefix}_${upname}=yes" >> $makefile
fi
done
+ prefix="${saved_prefix}"
}
print_config_h() {
- local prefix=$1
- local header=$2
+ saved_prefix="${prefix}"
+ prefix=$1
+ header=$2
shift 2
for cfg; do
upname="`toupper $cfg`"
@@ -1337,10 +1342,11 @@ print_config_h() {
echo "#define ${prefix}_${upname} 0" >> $header
fi
done
+ prefix="${saved_prefix}"
}
print_config_vars_h() {
- local header=$1
+ header=$1
shift
while [ $# -gt 0 ]; do
upname="`toupper $1`"
@@ -1350,9 +1356,10 @@ print_config_vars_h() {
}
print_webm_license() {
- local destination=$1
- local prefix="$2"
- local suffix="$3"
+ saved_prefix="${prefix}"
+ destination=$1
+ prefix="$2"
+ suffix="$3"
shift 3
cat <<EOF > ${destination}
${prefix} Copyright (c) 2011 The WebM project authors. All Rights Reserved.${suffix}
@@ -1363,6 +1370,7 @@ ${prefix} tree. An additional intellectual property rights grant can be found${s
${prefix} in the file PATENTS. All contributing project authors may${suffix}
${prefix} be found in the AUTHORS file in the root of the source tree.${suffix}
EOF
+ prefix="${saved_prefix}"
}
process_targets() {