cerbero: cerbero: Require CC/CXX/AR, fix splitting of empty space

[Nicolas Dufresne]

Le jeudi 19 juillet 2018 à 19:06 +0000, Nirbheek Chauhan a écrit :
> Module: cerbero
> Branch: master
> Commit: 2d871f5312bcaed1207b48cb208b748208946cfd
> URL:    http://cgit.freedesktop.org/gstreamer/cerbero/commit/?id=2d87
> 1f5312bcaed1207b48cb208b748208946cfd
> 
> Author: Nirbheek Chauhan <nirbheek at centricular.com>
> Date:   Fri Jul 20 00:52:25 2018 +0530
> 
> cerbero: Require CC/CXX/AR, fix splitting of empty space
> 
> When a tool is not defined, it should be `[]` not `['']`. Also,
> CC/CXX/AR are always defined and needed while cross-compiling, so
> require them.

They are not always defined, please fix the regressions:

https://ci.gstreamer.net/job/cerbero-cross-mingw64/7483/console

> 
> ---
> 
>  cerbero/build/build.py | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/cerbero/build/build.py b/cerbero/build/build.py
> index 5aa66cce..fc97c436 100644
> --- a/cerbero/build/build.py
> +++ b/cerbero/build/build.py
> @@ -492,11 +492,11 @@ class Meson (Build, ModifyEnvBase) :
>          # Take cross toolchain from _old_env because we removed them
> from the
>          # env so meson doesn't detect them as the native toolchain.
>          # Same for *FLAGS below.
> -        cc = os.environ.get('CC', '').split(' ')
> -        cxx = os.environ.get('CXX', '').split(' ')
> -        ar = os.environ.get('AR', '').split(' ')
> -        strip = os.environ.get('STRIP', '').split(' ')
> -        windres = os.environ.get('WINDRES', '').split(' ')
> +        cc = os.environ['CC'].split()
> +        cxx = os.environ['CXX'].split()
> +        ar = os.environ['AR'].split()
> +        strip = os.environ.get('STRIP', '').split()
> +        windres = os.environ.get('WINDRES', '').split()
>  
>          if isinstance(self.config.universal_archs, dict):
>              # Universal builds have arch-specific prefixes inside
> the universal prefix
> @@ -596,8 +596,8 @@ class Meson (Build, ModifyEnvBase) :
>                          'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS'):
>                  if var in os.environ:
>                      del os.environ[var]
> -            # Re-add *FLAGS that weren't set by the config, but
> instead were set in
> -            # the recipe or other places via @modify_environment
> +            # Re-add *FLAGS that weren't set by the config, but
> instead were
> +            # set in the recipe or other places via
> @modify_environment
>              if self.using_msvc():
>                  for var in ('CFLAGS', 'CXXFLAGS', 'CPPFLAGS',
> 'LDFLAGS'):
>                      if var in self.append_env or var in
> self.prepend_env:
> 
> _______________________________________________
> gstreamer-commits mailing list
> gstreamer-commits at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/gstreamer-commits