diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-04 18:30:41 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-07 16:53:49 +0100 |
| commit | 2baa43b47ad10254720f1a63878926db97f32183 (patch) | |
| tree | 3da7495d463a5fff3f4d64e1bf49b2d166ecaa4e /recipes/glib.recipe | |
| parent | dafea8db996ca2b08433377dd1277578068c3896 (diff) | |
Add support for ARM in the universal build
Diffstat (limited to 'recipes/glib.recipe')
| -rw-r--r-- | recipes/glib.recipe | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 3d7b45fc..eabb1590 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -7,6 +7,8 @@ GLIB_CONFIG_UNVERSAL='''\ #include "ppc/glibconfig.h" #elif defined(__x86_64__) #include "x86_64/glibconfig.h" +#elif defined(__arm__) +#include "arm/glibconfig.h" #else #error "Unsupported Architecture" #endif @@ -129,11 +131,13 @@ class Recipe(recipe.Recipe): 'include', 'glibconfig.h')) if self.config.target_platform in [Platform.DARWIN, Platform.IOS]: # For the universal build we need to ship glibconfig.h of both - # architectures ina subfolder and include the correct one depending + # architectures in a subfolder and include the correct one depending # on the compiler architecture arch = self.config.target_arch if arch == Architecture.X86: arch = 'i386' + if arch in [Architecture.ARM, Architecture.ARMv7]: + arch = 'arm' arch_dir = os.path.join(self.config.prefix, 'lib', 'glib-2.0', 'include', arch) |