configure: Revert some incorrect uses of check_cc()

Message ID 20180329072807.20992-1-diego@biurrun.de
State Committed
Commit e744281c49496b0e0a357e9f84c37fbf99215e20
Headers show
Series
  • configure: Revert some incorrect uses of check_cc()
Related show

Commit Message

Diego Biurrun March 29, 2018, 7:28 a.m.
---

Thanks to James for pointing this out.

 configure | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Comments

Luca Barbato March 29, 2018, 2:20 p.m. | #1
On 29/03/2018 09:28, Diego Biurrun wrote:
> ---
> 
> Thanks to James for pointing this out.
> 
>   configure | 16 +++++++++++-----
>   1 file changed, 11 insertions(+), 5 deletions(-)
> 

Probably Ok.
James Almer March 29, 2018, 2:25 p.m. | #2
On 3/29/2018 4:28 AM, Diego Biurrun wrote:
> ---
> 
> Thanks to James for pointing this out.
> 
>  configure | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/configure b/configure
> index 90fb6f07ca..a64f241560 100755
> --- a/configure
> +++ b/configure
> @@ -4841,7 +4841,9 @@ check_disable_warning_headers -Wno-unused-variable
>  
>  check_objcflags -fobjc-arc && enable objc_arc
>  
> -check_cc blocks_extension "" "void (^block)(void)"
> +test_cc <<EOF && enable blocks_extension
> +void (^block)(void);
> +EOF
>  
>  # add some linker flags
>  check_ldflags -Wl,--warn-common
> @@ -4895,10 +4897,14 @@ if enabled proper_dce; then
>      if test_ldflags -Wl,${version_script},$TMPV; then
>          append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver'
>          quotes='""'
> -        check_cc symver_asm_label "" "void ff_foo(void) __asm__ ("av_foo@VERSION");
> -                                      void ff_foo(void) { ${inline_asm+__asm__($quotes);} }"
> -        check_cc symver_gnu_asm   "" "__asm__(".symver ff_foo,av_foo@VERSION");
> -                                      void ff_foo(void) {}"
> +        test_cc <<EOF && enable symver_asm_label
> +void ff_foo(void) __asm__ ("av_foo@VERSION");
> +void ff_foo(void) { ${inline_asm+__asm__($quotes);} }
> +EOF
> +        test_cc <<EOF && enable symver_gnu_asm
> +__asm__(".symver ff_foo,av_foo@VERSION");
> +void ff_foo(void) {}
> +EOF
>      fi
>  fi

LGTM

Patch

diff --git a/configure b/configure
index 90fb6f07ca..a64f241560 100755
--- a/configure
+++ b/configure
@@ -4841,7 +4841,9 @@  check_disable_warning_headers -Wno-unused-variable
 
 check_objcflags -fobjc-arc && enable objc_arc
 
-check_cc blocks_extension "" "void (^block)(void)"
+test_cc <<EOF && enable blocks_extension
+void (^block)(void);
+EOF
 
 # add some linker flags
 check_ldflags -Wl,--warn-common
@@ -4895,10 +4897,14 @@  if enabled proper_dce; then
     if test_ldflags -Wl,${version_script},$TMPV; then
         append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver'
         quotes='""'
-        check_cc symver_asm_label "" "void ff_foo(void) __asm__ ("av_foo@VERSION");
-                                      void ff_foo(void) { ${inline_asm+__asm__($quotes);} }"
-        check_cc symver_gnu_asm   "" "__asm__(".symver ff_foo,av_foo@VERSION");
-                                      void ff_foo(void) {}"
+        test_cc <<EOF && enable symver_asm_label
+void ff_foo(void) __asm__ ("av_foo@VERSION");
+void ff_foo(void) { ${inline_asm+__asm__($quotes);} }
+EOF
+        test_cc <<EOF && enable symver_gnu_asm
+__asm__(".symver ff_foo,av_foo@VERSION");
+void ff_foo(void) {}
+EOF
     fi
 fi