diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-01 09:17:31 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-01 09:17:31 +0200 |
| commit | bc5403e423a30a892b61373aee88c6eb9a40044f (patch) | |
| tree | 5e296376851d0548601407a3d515ae1b2647b903 /config | |
| parent | 2176368d92b651603af225902b4cddd858461847 (diff) | |
| parent | debe50411065467f44177495179a9881974d6495 (diff) | |
Merge branch 'master' into upstream
Conflicts:
recipes/gst-rtsp-server-1.0.recipe
Diffstat (limited to 'config')
| -rw-r--r-- | config/android.config | 1 | ||||
| -rw-r--r-- | config/ios.config | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/android.config b/config/android.config index 58f8067f..bdcab969 100644 --- a/config/android.config +++ b/config/android.config @@ -97,6 +97,7 @@ os.environ['AR']= cmd('ar') os.environ['AS']= cmd('as') os.environ['NM']= cmd('nm') os.environ['STRIP']= cmd('strip') +os.environ['OBJCOPY']= cmd('objcopy') os.environ['PATH'] = '%s:%s:%s' % (toolchain_prefix, toolchain_path, os.environ['PATH']) # For the libc.so dependency in i686-linux-android-as diff --git a/config/ios.config b/config/ios.config index 20930b89..e8e1fbf9 100644 --- a/config/ios.config +++ b/config/ios.config @@ -6,6 +6,7 @@ import os from cerbero.utils import shell from cerbero.config import Architecture, DistroVersion +from cerbero.errors import FatalError # We don't want anything from macports detected in configure and # used later. System libs are passed through the -isysroot option @@ -48,7 +49,7 @@ elif target_arch == Architecture.X86: elif target_arch == Architecture.UNIVERSAL: arch_cflags='' else: - raise FatalError("Arch not supported") + raise FatalError("Arch %s not supported" % target_arch) # Toolchain environment os.environ['PATH'] = '%s:%s' % (_toolchain_root, os.environ['PATH']) |