]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '831005b2302cbeb377e3f00fd18c78928bcec185'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 17:32:32 +0000 (14:32 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 17:32:32 +0000 (14:32 -0300)
* commit '831005b2302cbeb377e3f00fd18c78928bcec185':
  configure: Log correct test name and use correct filter when testing objective C flags

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc configure
index f3b88b44086d7b5d7a47ccfa748021d3fb3d6456,4cfa0662d0a0f8d5d8529171f0514271ac6a0478..e23b211c20497adee1cc27d339b9d7191bbc2f30
+++ b/configure
@@@ -1036,17 -883,9 +1036,17 @@@ check_cflags()
      test_cflags "$@" && add_cflags "$@"
  }
  
 +check_cxxflags(){
 +    log check_cxxflags "$@"
 +    set -- $($cflags_filter "$@")
 +    check_cxx "$@" <<EOF && append CXXFLAGS "$@"
 +int x;
 +EOF
 +}
 +
  test_objcflags(){
-     log test_cflags "$@"
-     set -- $($cflags_filter "$@")
+     log test_objcflags "$@"
+     set -- $($objcflags_filter "$@")
      check_objcc "$@" <<EOF
  int x;
  EOF