js/configs
1
1
Fork 0
Code Activity

Bring zsh and fish back in sync

Browse source
This commit is contained in:
Jonathan Schleifer 2022-11-25 22:16:50 +00:00
parent 84a7f938fb
commit fe8461f4b8
9 changed files with 81 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fish/functions/cross.fish
View file

@ -43,7 +43,7 @@ function cross --description 'Set up cross-compilation environment'
return 1
end
case ios iossim
if ! type -q xcrun
if not type -q xcrun
echo 'Can only cross-compile for iOS on a Mac with Xcode!'
return 1
end
@ -66,10 +66,10 @@ function cross --description 'Set up cross-compilation environment'
set archs $default_archs
end
set -gx CC clang --sysroot $sdk
set -gx CPP clang -E --sysroot $sdk
set -gx CXX clang++ --sysroot $sdk
set -gx CXXPP clang++ -E --sysroot $sdk
set -gx CC clang -isysroot $sdk
set -gx CPP clang -E -isysroot $sdk
set -gx CXX clang++ -isysroot $sdk
set -gx CXXPP clang++ -E -isysroot $sdk
for arch in $archs
set -a CC -arch $arch
@ -106,7 +106,7 @@ function cross --description 'Set up cross-compilation environment'
set PATH $prefix/cross/$cross_host/bin $PATH
case morphos
set -l prefix (pkg_info -qp ppc-morphos-gcc-9 |
set -l prefix (pkg_info -qp ppc-morphos-gcc-11 |
awk '/^@cwd/ { print $2; exit }')
if test -z "$prefix"
@ -115,10 +115,10 @@ function cross --description 'Set up cross-compilation environment'
end
set PATH $prefix/gg/bin $PATH
set -gx CC ppc-morphos-gcc-9
set -gx CXX ppc-morphos-g++-9
set -gx OBJC ppc-morphos-gcc-9
set -gx OBJCXX ppc-morphos-g++-9
set -gx CC ppc-morphos-gcc-11
set -gx CXX ppc-morphos-g++-11
set -gx OBJC ppc-morphos-gcc-11
set -gx OBJCXX ppc-morphos-g++-11
set -g cross_host ppc-morphos
case switch
if test -z "$DEVKITPRO"
@ -130,9 +130,9 @@ function cross --description 'Set up cross-compilation environment'
return 1
end
set PATH $DEVKITA64/bin $PATH
set PATH $DEVKITA64/bin $DEVKITPRO/tools/bin $PATH
set -g cross_host aarch64-none-elf
set -g objfw_configure_flags --with-switch
set -g objfw_configure_flags --with-nintendo-switch
case wii wii-u
if test -z "$DEVKITPRO"
echo 'Please set DEVKITPRO!'
@ -143,7 +143,7 @@ function cross --description 'Set up cross-compilation environment'
return 1
end
set PATH $DEVKITPPC/bin $PATH
set PATH $DEVKITPPC/bin $DEVKITPRO/tools/bin $PATH
set -g cross_host powerpc-eabi
set -g objfw_configure_flags --with-$argv[1]
case '*'