diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-05-31 17:03:54 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-05-31 17:03:54 +0200 |
| commit | 9b893d3edf2100976fe104f6867b85ba7c84cdbe (patch) | |
| tree | a6568ff5382e3676b0588940d181a3f616294ae8 /config | |
| parent | 10c994dfda8d5b910a020f79c2fb99ab5b9bffc1 (diff) | |
revert change pshed by mistake
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin.config | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/config/darwin.config b/config/darwin.config index bf9d678..6d86dfb 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -69,23 +69,11 @@ if target_arch == Architecture.X86_64: arch_cflags += ' -arch x86_64 -m64' arch_ldflags += ' -arch x86_64 -m64 -Wl,-arch,x86_64' elif target_arch == Architecture.X86: -<<<<<<< Updated upstream arch_cflags += ' -arch i386 -m32' arch_ldflags += ' -arch i386 -m32 -Wl,-arch,i386' elif target_arch == Architecture.PPC: arch_cflags += ' -arch ppc' arch_ldflags += ' -arch ppc -Wl,-arch,ppc' -======= - os.environ['CFLAGS'] += ' -arch i386 -m32' - os.environ['LDFLAGS'] += ' -arch i386 -m32 -Wl,-arch,i386' - os.environ['CCASFLAGS'] += ' -arch i386 -m32' - os.environ['OBJCFLAGS'] += ' -arch i386 -m32' -elif target_arch == Architecture.PPC: - os.environ['CFLAGS'] += ' -arch ppc' - os.environ['LDFLAGS'] += ' -arch ppc -Wl,-arch,ppc' - os.environ['CCASFLAGS'] += ' -arch ppc' - os.environ['OBJCFLAGS'] += ' -arch ppc' ->>>>>>> Stashed changes incl_dir = os.path.join(prefix, 'include') if not os.path.exists(incl_dir): |