aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-02 09:55:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-02 09:55:47 +0100
commitb4f95c96a577f65d300ed94b5307773c13c4eb79 (patch)
tree843870ec10eb1fd9ab0d86a175e1d4e0a6416371
parent02223f4dc4da797030d932ef5d186be9c9aff9ae (diff)
parent23157d72b565e0228fec97f1eb059d4f8021a260 (diff)
downloadffmpeg-b4f95c96a577f65d300ed94b5307773c13c4eb79.tar.gz
Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260'
* commit '23157d72b565e0228fec97f1eb059d4f8021a260': configure: Split test_cflags function off from check_cflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure b/configure
index af322f5a57..e29cd1237d 100755
--- a/configure
+++ b/configure
@@ -857,14 +857,19 @@ int x;
EOF
}
-check_cflags(){
- log check_cflags "$@"
+test_cflags(){
+ log test_cflags "$@"
set -- $($cflags_filter "$@")
- check_cc "$@" <<EOF && append CFLAGS "$@"
+ check_cc "$@" <<EOF
int x;
EOF
}
+check_cflags(){
+ log check_cflags "$@"
+ test_cflags "$@" && add_cflags "$@"
+}
+
check_cxxflags(){
log check_cxxflags "$@"
set -- $($cflags_filter "$@")