Skip to content

Commit

Permalink
revert patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ocefpaf committed Oct 6, 2020
1 parent cc8e873 commit b562eab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion recipe/build_base.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ex

coco
# Get an updated config.sub and config.guess
cp $BUILD_PREFIX/share/libtool/build-aux/config.* .

Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
From 42c10724b545cb3b0bb2d98f2e85bd1dcac6b80a Mon Sep 17 00:00:00 2001
From 0fcc174b9cef0d93ebf1c95fd942c1368132cfdc Mon Sep 17 00:00:00 2001
From: Ray Donnelly <[email protected]>
Date: Wed, 16 Aug 2017 08:48:16 +0100
Subject: [PATCH 01/30] Darwin: Add -arch x86_64 to UnicCCompiler ld_args
Subject: [PATCH 02/22] Darwin: Add -arch x86_64 to UnicCCompiler ld_args

---
Lib/distutils/unixccompiler.py | 1 +
1 file changed, 1 insertion(+)

diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index 4d7a6de740..3f05cf7f8c 100644
index 4d7a6de..3f05cf7 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -200,6 +200,7 @@ class UnixCCompiler(CCompiler):
@@ -200,6 +200,8 @@ class UnixCCompiler(CCompiler):

if sys.platform == 'darwin':
linker = _osx_support.compiler_fixup(linker, ld_args)
+ ld_args = ['-arch', 'x86_64'] + ld_args
+ from distutils.util import get_host_platform
+ ld_args = ['-arch', get_host_platform().split("-")[-1]] + ld_args

self.spawn(linker + ld_args)
except DistutilsExecError as msg:
--
2.23.0
2.20.1

0 comments on commit b562eab

Please sign in to comment.