Index: source/libvpx/build/make/configure.sh |
=================================================================== |
--- source/libvpx/build/make/configure.sh (revision 263011) |
+++ source/libvpx/build/make/configure.sh (working copy) |
@@ -41,7 +41,7 @@ |
log_file(){ |
log BEGIN $1 |
- pr -n -t $1 >>$logfile |
+ cat -n $1 >>$logfile |
log END $1 |
} |
@@ -274,6 +274,7 @@ |
clean_temp_files() { |
rm -f ${TMP_C} ${TMP_CC} ${TMP_H} ${TMP_O} ${TMP_X} ${TMP_ASM} |
+ enabled gcov && rm -f ${TMP_C%.c}.gcno ${TMP_CC%.cc}.gcno |
} |
# |
@@ -327,7 +328,7 @@ |
check_cflags() { |
log check_cflags "$@" |
- check_cc "$@" <<EOF |
+ check_cc -Werror "$@" <<EOF |
int x; |
EOF |
} |
@@ -341,7 +342,7 @@ |
int x; |
EOF |
;; |
- *) check_cxx "$@" <<EOF |
+ *) check_cxx -Werror "$@" <<EOF |
int x; |
EOF |
;; |
@@ -378,6 +379,19 @@ |
fi |
} |
+# 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" |
+ [ -n "$feature" ] || feature="$opt" |
+ |
+ if enabled gcc && ! disabled "$feature" && ! check_cflags "-m$opt"; then |
+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-$feature " |
+ else |
+ soft_enable "$feature" |
+ fi |
+} |
+ |
write_common_config_banner() { |
print_webm_license config.mk "##" "" |
echo '# This file automatically generated by configure. Do not edit!' >> config.mk |
@@ -405,8 +419,8 @@ |
} |
write_common_target_config_mk() { |
- local CC=${CC} |
- local CXX=${CXX} |
+ local CC="${CC}" |
+ local CXX="${CXX}" |
enabled ccache && CC="ccache ${CC}" |
enabled ccache && CXX="ccache ${CXX}" |
print_webm_license $1 "##" "" |
@@ -1089,31 +1103,17 @@ |
esac |
soft_enable runtime_cpu_detect |
- soft_enable mmx |
- soft_enable sse |
- soft_enable sse2 |
- soft_enable sse3 |
- soft_enable ssse3 |
# We can't use 'check_cflags' until the compiler is configured and CC is |
# populated. |
- if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then |
- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 " |
- else |
- soft_enable sse4_1 |
- fi |
+ check_gcc_machine_option mmx |
+ check_gcc_machine_option sse |
+ check_gcc_machine_option sse2 |
+ check_gcc_machine_option sse3 |
+ check_gcc_machine_option ssse3 |
+ check_gcc_machine_option sse4 sse4_1 |
+ check_gcc_machine_option avx |
+ check_gcc_machine_option avx2 |
- if enabled gcc && ! disabled avx && ! check_cflags -mavx; then |
- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx " |
- else |
- soft_enable avx |
- fi |
- |
- if enabled gcc && ! disabled avx2 && ! check_cflags -mavx2; then |
- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx2 " |
- else |
- soft_enable avx2 |
- fi |
- |
case "${AS}" in |
auto|"") |
which nasm >/dev/null 2>&1 && AS=nasm |