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
df419064
Commit
df419064
authored
Jan 27, 2020
by
mattip
Browse files
invert wrong logic, skip cfitsio on macOS
parent
de94da5e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
common_utils.sh
common_utils.sh
+3
-3
tests/test_library_builders.sh
tests/test_library_builders.sh
+4
-1
No files found.
common_utils.sh
View file @
df419064
...
@@ -432,10 +432,10 @@ function install_pypy {
...
@@ -432,10 +432,10 @@ function install_pypy {
"
ppc64le
") suffix="
ppc64le
";;
"
ppc64le
") suffix="
ppc64le
";;
"
s30x
") suffix="
s390x
";;
"
s30x
") suffix="
s390x
";;
"
aarch64
") suffix="
aarch64
";;
"
aarch64
") suffix="
aarch64
";;
*) if [ -
z
"
$IS_OSX
" ]; then
*) if [ -
n
"
$IS_OSX
" ]; then
suffix
=
"
osx64
";
suffix
=
"
osx64
";
else
else
echo unknown platform
$PLAT
; exit 1
echo unknown platform
"
$PLAT
"
; exit 1
fi;;
fi;;
esac
esac
...
...
tests/test_library_builders.sh
View file @
df419064
...
@@ -50,7 +50,10 @@ if [ -z "$IS_OSX" ]; then
...
@@ -50,7 +50,10 @@ if [ -z "$IS_OSX" ]; then
suppress build_lzo
suppress build_lzo
fi
fi
suppress build_ragel
suppress build_ragel
suppress build_cfitsio
if
[
-z
"
$IS_OSX
"
]
;
then
# already installed in the macOS image, so `brew install cfitsio` fails
suppress build_cfitsio
fi
suppress build_new_zlib
suppress build_new_zlib
suppress build_hdf5
suppress build_hdf5
...
...
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