diff options
| author | Edward Hervey <edward@centricular.com> | 2015-12-01 14:29:42 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2015-12-01 14:59:11 +0100 |
| commit | 8f81eb664001283b7c048988483d0e423d3e33c0 (patch) | |
| tree | 971a727186325909ed62645ea8ed661e8a758dc1 | |
| parent | a89fce35ee16967e7b85e76fb8363b96ac605b27 (diff) | |
config/darwin: Properly set ARCHFLAGS
This allows creating 'light' binaries (i.e. just one arch) when we
are not targetting universal builds
And remove the gobject-introspection.recipe specific fix
| -rw-r--r-- | config/darwin.config | 4 | ||||
| -rw-r--r-- | recipes/gobject-introspection.recipe | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/darwin.config b/config/darwin.config index 3ffb8a38..df98fe13 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -79,6 +79,10 @@ os.environ['CC'] = 'clang' os.environ['OBJC'] = 'clang' os.environ['CXX'] = 'clang++' +if target_arch != Architecture.UNIVERSAL: + # Ensure lightweight architectures are build when only targetting one arch + os.environ['ARCHFLAGS'] = '-arch %s' % target_arch + # Link GL headers gl_headers = os.path.join(sdk_root, 'usr', 'X11', 'include', 'GL') if not os.path.exists(gl_headers): diff --git a/recipes/gobject-introspection.recipe b/recipes/gobject-introspection.recipe index ce8191aa..1e10feb8 100644 --- a/recipes/gobject-introspection.recipe +++ b/recipes/gobject-introspection.recipe @@ -79,9 +79,6 @@ class Recipe(recipe.Recipe): # the full path needs to be specified, since shebangs are generated if self.config.target_distro == Distro.ARCH: self.config_sh = "PYTHON=/usr/bin/python2 %s" % self.config_sh - # on OSX specify which architecture we want - if self.config.target_platform in [Platform.DARWIN]: - self.new_env['ARCHFLAGS'] = '-arch %s' % self.config.target_arch # TODO: catch the share/man stuff like man1/g-ir* ? def configure(self): |