Compare commits
4 Commits
f1a0162e07
...
63d071e704
| Author | SHA1 | Date |
|---|---|---|
|
|
63d071e704 | |
|
|
604f19a9ea | |
|
|
7563f920c7 | |
|
|
4fc7271244 |
|
|
@ -272,9 +272,9 @@ case "$gitstatus_kernel" in
|
||||||
gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
|
gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
|
||||||
fi
|
fi
|
||||||
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
|
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
|
||||||
gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
|
gitstatus_ldlibs="$gitstatus_ldlibs -liconv -lz"
|
||||||
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 -DUSE_BUNDLED_ZLIB=OFF"
|
||||||
;;
|
;;
|
||||||
msys*|mingw*)
|
msys*|mingw*)
|
||||||
gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
|
gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
|
||||||
|
|
@ -551,6 +551,7 @@ if [ -z "$gitstatus_cpu" ]; then
|
||||||
arm64|aarch64) gitstatus_cpu=armv8-a;;
|
arm64|aarch64) gitstatus_cpu=armv8-a;;
|
||||||
ppc64|ppc64le) gitstatus_cpu=powerpc64le;;
|
ppc64|ppc64le) gitstatus_cpu=powerpc64le;;
|
||||||
riscv64) gitstatus_cpu=rv64imafdc;;
|
riscv64) gitstatus_cpu=rv64imafdc;;
|
||||||
|
mips64) gitstatus_cpu=mips64;;
|
||||||
loongarch64) gitstatus_cpu=loongarch64;;
|
loongarch64) gitstatus_cpu=loongarch64;;
|
||||||
x86_64|amd64) gitstatus_cpu=x86-64;;
|
x86_64|amd64) gitstatus_cpu=x86-64;;
|
||||||
x86) gitstatus_cpu=i586;;
|
x86) gitstatus_cpu=i586;;
|
||||||
|
|
|
||||||
|
|
@ -8492,6 +8492,12 @@ _p9k_init_ssh() {
|
||||||
if [[ -n $SSH_CLIENT || -n $SSH_TTY || -n $SSH_CONNECTION ]]; then
|
if [[ -n $SSH_CLIENT || -n $SSH_TTY || -n $SSH_CONNECTION ]]; then
|
||||||
P9K_SSH=1
|
P9K_SSH=1
|
||||||
return 0
|
return 0
|
||||||
|
elif [[ \
|
||||||
|
$(grep -i Microsoft /proc/version) && \
|
||||||
|
$(cmd.exe /c 'echo %SSH_CLIENT%' 2>/dev/null | sed $'s/\r//' | grep ' 22$') \
|
||||||
|
]]; then
|
||||||
|
P9K_SSH=1
|
||||||
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost.
|
# When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue