diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-04-26 13:17:40 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-04-26 13:17:40 +0200 |
| commit | 46f78bd34a30681de051a44bb938484ed40ebca2 (patch) | |
| tree | 794c83bbd564e56fd731f1c73f0163394a1b8661 | |
| parent | b6fa6782caa03128ccd7b575856b7dbcd239d789 (diff) | |
Use clang instead of gcc on OSX
clang is the default compiler on OSX since a long time and
later xcode versions don't even ship gcc anymore.
| -rw-r--r-- | cerbero/ide/xcode/fwlib.py | 2 | ||||
| -rw-r--r-- | config/darwin.config | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cerbero/ide/xcode/fwlib.py b/cerbero/ide/xcode/fwlib.py index 85dd689a..e8b7ff52 100644 --- a/cerbero/ide/xcode/fwlib.py +++ b/cerbero/ide/xcode/fwlib.py @@ -78,7 +78,7 @@ class FrameworkLibrary(object): class DynamicFrameworkLibrary(FrameworkLibrary): def _create_framework_library(self, libraries): libraries = ' '.join(['-Wl,-reexport_library %s' % x for x in libraries]) - shell.call('gcc -dynamiclib -o %s -arch %s -install_name %s %s' % + shell.call('clang -dynamiclib -o %s -arch %s -install_name %s %s' % (self.libname, self.arch, self.install_name, libraries)) def _get_lib_file_name(self, lib): diff --git a/config/darwin.config b/config/darwin.config index 863e7640..2e0b4241 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -74,8 +74,8 @@ os.environ['AR'] = 'ar' os.environ['RANLIB'] = 'ranlib' os.environ['NM'] = 'nm' os.environ['OBJCOPY'] = 'objcopy' -os.environ['CC'] = 'gcc' -os.environ['CXX'] = 'g++' +os.environ['CC'] = 'clang' +os.environ['CXX'] = 'clang++' # Link GL headers gl_headers = os.path.join(sdk_root, 'usr', 'X11', 'include', 'GL') @@ -91,9 +91,9 @@ if not os.path.exists(gl_headers_prefix): raise Exception ("GL headers path not found: %s" % gl_headers) if use_ccache: - comp = os.environ.get('CC', 'gcc') + comp = os.environ.get('CC', 'clang') if not 'ccache' in comp: os.environ['CC'] = 'ccache ' + comp - comp = os.environ.get('CXX', 'g++') + comp = os.environ.get('CXX', 'clang++') if not 'ccache' in comp: os.environ['CXX'] = 'ccache ' + comp |