mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-12 08:10:07 +00:00
Merge commit '790f4719ab3db8d62f8dec6fbb89a91d87e81df0'
This commit is contained in:
commit
ece7213a3d
2 changed files with 15 additions and 7 deletions
|
@ -11,6 +11,12 @@ fi
|
||||||
|
|
||||||
export LC_ALL=C
|
export LC_ALL=C
|
||||||
|
|
||||||
|
if [ -z "${ZSH_VERSION-}" ] && command -v zsh >/dev/null 2>&1; then
|
||||||
|
case "${BASH_VERSION-}" in
|
||||||
|
[0-3].*) exec zsh "$0" "$@";;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
usage="$(command cat <<\END
|
usage="$(command cat <<\END
|
||||||
Usage: build [-m ARCH] [-c CPU] [-d CMD] [-i IMAGE] [-s] [-w]
|
Usage: build [-m ARCH] [-c CPU] [-d CMD] [-i IMAGE] [-s] [-w]
|
||||||
|
|
||||||
|
@ -29,7 +35,7 @@ Options:
|
||||||
succeed; on some operating systems this option is not
|
succeed; on some operating systems this option is not
|
||||||
supported; on others it can have partial effect
|
supported; on others it can have partial effect
|
||||||
-w automatically download tarballs for dependencies if they
|
-w automatically download tarballs for dependencies if they
|
||||||
don't already exist in ./deps; dependencies are described
|
do not already exist in ./deps; dependencies are described
|
||||||
in ./build.info
|
in ./build.info
|
||||||
END
|
END
|
||||||
)"
|
)"
|
||||||
|
@ -159,10 +165,11 @@ case "$gitstatus_kernel" in
|
||||||
;;
|
;;
|
||||||
darwin)
|
darwin)
|
||||||
command mkdir -- "$workdir"/lib
|
command mkdir -- "$workdir"/lib
|
||||||
command ln -s -- /usr/local/opt/libiconv/lib/libiconv.a "$workdir"/lib
|
brew_prefix="$(command brew --prefix)"
|
||||||
|
command ln -s -- "$brew_prefix"/opt/libiconv/lib/libiconv.a "$workdir"/lib
|
||||||
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
|
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
|
||||||
libgit2_cflags="$libgit2_cflags -I/usr/local/opt/libiconv/include"
|
libgit2_cflags="$libgit2_cflags -I"$brew_prefix"/opt/libiconv/include"
|
||||||
gitstatus_cxxflags="$gitstatus_cxxflags -I/usr/local/opt/libiconv/include"
|
gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
|
||||||
gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
|
gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
|
||||||
gitstatus_ldflags="$gitstatus_ldflags -L${workdir}/lib"
|
gitstatus_ldflags="$gitstatus_ldflags -L${workdir}/lib"
|
||||||
libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF"
|
libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF"
|
||||||
|
|
|
@ -181,9 +181,10 @@ local build='
|
||||||
function build-unix() {
|
function build-unix() {
|
||||||
local intro flags=(-sw)
|
local intro flags=(-sw)
|
||||||
case $2 in
|
case $2 in
|
||||||
linux-ppc64le);;
|
linux-ppc64le) ;;
|
||||||
linux-*) flags+=(-d docker);;
|
linux-*) flags+=(-d docker);;
|
||||||
darwin-*) intro='PATH="/usr/local/bin:$PATH"';;
|
darwin-aarch64) intro='PATH="/opt/homebrew/bin:$PATH"';;
|
||||||
|
darwin-*) intro='PATH="/usr/local/bin:$PATH"';;
|
||||||
esac
|
esac
|
||||||
ssh $1 -- /bin/sh -uex <<<"
|
ssh $1 -- /bin/sh -uex <<<"
|
||||||
$intro
|
$intro
|
||||||
|
|
Loading…
Reference in a new issue