Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-21 20:00:07 +00:00
Code Releases Activity

Merge commit '4b21cd06ffeb5706b017c78b13c2eaf40d7deac1'

Browse source
This commit is contained in:
Roman Perepelitsa 2022-02-07 08:38:49 +01:00
commit a83e53005f
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gitstatus/build
View file

@ -100,7 +100,7 @@ if [ -n "$gitstatus_install_tools" ]; then
exit 1 exit 1
fi fi
;; ;;
freebsd) freebsd|dragonfly)
command pkg install -y cmake gmake binutils git perl5 wget command pkg install -y cmake gmake binutils git perl5 wget
;; ;;
openbsd) openbsd)
@ -141,7 +141,7 @@ if [ -n "$gitstatus_install_tools" ]; then
fi fi
cpus="$(command getconf _NPROCESSORS_ONLN 2>/dev/null)" || cpus="$(command getconf _NPROCESSORS_ONLN 2>/dev/null)" ||
cpus="$(command sysctl -n hw.ncpu 2>/dev/null)" || cpus="$(command sysctl -n hw.ncpu 2>/dev/null)" ||
cpus=8 cpus=8
case "$gitstatus_cpu" in case "$gitstatus_cpu" in
@ -174,12 +174,21 @@ if 2>/dev/null "$CC" \
fi fi
command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
if 2>/dev/null "$CC" \ if 2>/dev/null "$CC" \
-fstack-clash-protection -fcf-protection \ -fstack-clash-protection \
-Werror \ -Werror \
-c "$workdir"/cc-test.c \ -c "$workdir"/cc-test.c \
-o "$workdir"/cc-test.o; then -o "$workdir"/cc-test.o; then
cflags="$cflags -fstack-clash-protection -fcf-protection" cflags="$cflags -fstack-clash-protection"
fi
command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
if 2>/dev/null "$CC" \
-fcf-protection \
-Werror \
-c "$workdir"/cc-test.c \
-o "$workdir"/cc-test.o; then
cflags="$cflags -fcf-protection"
fi fi
command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
@ -224,6 +233,12 @@ case "$gitstatus_kernel" in
gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}" gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON" libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON"
;; ;;
dragonfly)
gitstatus_cxx=clang++12
gitstatus_make=gmake
gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON"
;;
openbsd) openbsd)
gitstatus_cxx=eg++ gitstatus_cxx=eg++
gitstatus_make=gmake gitstatus_make=gmake
@ -574,7 +589,7 @@ case "$gitstatus_kernel" in
fi fi
fi fi
;; ;;
freebsd|openbsd|netbsd|darwin) freebsd|openbsd|netbsd|darwin|dragonfly)
if [ -n "$docker_cmd" ]; then if [ -n "$docker_cmd" ]; then
>&2 echo "[error] docker (-d) is not supported on $gitstatus_kernel" >&2 echo "[error] docker (-d) is not supported on $gitstatus_kernel"
exit 1 exit 1