Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
a4a71296
Commit
a4a71296
authored
Feb 13, 2019
by
Rob Buckley
Browse files
use consistent bash test brackets
parent
141880c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
configure_build.sh
configure_build.sh
+2
-2
osx_utils.sh
osx_utils.sh
+2
-2
No files found.
configure_build.sh
View file @
a4a71296
...
@@ -16,9 +16,9 @@ BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
...
@@ -16,9 +16,9 @@ BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
# IS_OSX is defined in common_utils.sh
# IS_OSX is defined in common_utils.sh
if
[
-n
"
$IS_OSX
"
]
;
then
if
[
-n
"
$IS_OSX
"
]
;
then
MAC_ARCH
=
$(
mac_arch_for_pyosx_version
$MB_PYTHON_OSX_VER
)
MAC_ARCH
=
$(
mac_arch_for_pyosx_version
$MB_PYTHON_OSX_VER
)
if
[
"
$MAC_ARCH
"
==
"intel"
]
;
then
if
[
[
"
$MAC_ARCH
"
==
"intel"
]
]
;
then
ARCH_FLAGS
=
${
ARCH_FLAGS
:-
"-arch i386 -arch x86_64"
}
ARCH_FLAGS
=
${
ARCH_FLAGS
:-
"-arch i386 -arch x86_64"
}
elif
[
"
$MAC_ARCH
"
==
"x86_x64"
]
;
then
elif
[
[
"
$MAC_ARCH
"
==
"x86_x64"
]
]
;
then
ARCH_FLAGS
=
${
ARCH_FLAGS
:-
"-arch x86_64"
}
ARCH_FLAGS
=
${
ARCH_FLAGS
:-
"-arch x86_64"
}
else
else
echo
"invalid ARCH = '
$MAC_ARCH
'"
echo
"invalid ARCH = '
$MAC_ARCH
'"
...
...
osx_utils.sh
View file @
a4a71296
...
@@ -349,9 +349,9 @@ function repair_wheelhouse {
...
@@ -349,9 +349,9 @@ function repair_wheelhouse {
# with later OSX. Not necessary for OSX released well after pip 6.0. See:
# with later OSX. Not necessary for OSX released well after pip 6.0. See:
# https://github.com/MacPython/wiki/wiki/Spinning-wheels#question-will-pip-give-me-a-broken-wheel
# https://github.com/MacPython/wiki/wiki/Spinning-wheels#question-will-pip-give-me-a-broken-wheel
local
MAC_ARCH
=
$(
mac_arch_for_pyosx_version
$MB_PYTHON_OSX_VER
)
local
MAC_ARCH
=
$(
mac_arch_for_pyosx_version
$MB_PYTHON_OSX_VER
)
if
[
"
$MAC_ARCH
"
==
"x86_x64"
]
;
then
if
[
[
"
$MAC_ARCH
"
==
"x86_x64"
]
]
;
then
delocate-addplat
--rm-orig
-p
macosx_10_10_x86_64
$wheelhouse
/
*
.whl
delocate-addplat
--rm-orig
-p
macosx_10_10_x86_64
$wheelhouse
/
*
.whl
elif
[
"
$MAC_ARCH
"
==
"intel"
]
;
then
elif
[
[
"
$MAC_ARCH
"
==
"intel"
]
]
;
then
delocate-addplat
--rm-orig
-x
10_9
-x
10_10
$wheelhouse
/
*
.whl
delocate-addplat
--rm-orig
-x
10_9
-x
10_10
$wheelhouse
/
*
.whl
else
else
echo
"invalid ARCH = '
$MAC_ARCH
'"
echo
"invalid ARCH = '
$MAC_ARCH
'"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment