Cross compiling improvements + macOS universal binary (#1458)
* chore(resources): rename macos_arm64.txt to macos-arm64.txt This matches the platform-arch convention like many other parts of the project. * chore(resources/cross): rename wasm.txt to unknown-wasm32.txt * refactor(scripts/common.sh): use parameter expansion instead of if else * feat(scripts/common.sh): support custom arch and platform for get_default_build_dir * feat(scripts/build.sh): add --cross-platform, --cross-arch and --cross-file * feat(scripts/package.sh): add --cross-platform and --cross-arch * feat(build-packages.sh): add support for new options in build.sh and packages.sh * ci(build): make arm64 binaries in CI * ci(build): do not install external libraries * ci(build): fix invalid artifact name * ci(build): fix INSTALL_NAME * ci(build): change name for macos artifacts * ci(build): add script to build universal dmgs from individual dmgs * ci(build): build universal dmgs * fix(make-universal-binaries): fix wrong path for hdiutil * ci(build): rename macos action * fix(make-universal-binaries.sh): fix wrong pathname for ditto * ci(release): build macos universal binaries * ci(release): remove useless variables * ci(release): fix wrong dependency * ci(build): fix old ubuntu version This version will be restored once I complete some container-specific fixes. * ci(build): make build_macos_universal depend on release * ci(build): fix wrong dmg dir * style(ci): capitalize 'universal' for CI name * fix(make-universal-binaries.sh): fix truncated dmg name when it contains dots * ci: styling changes * ci(release): install appdmg only
This commit is contained in:
+3
-5
@@ -75,22 +75,20 @@ get_platform_name() {
|
||||
|
||||
get_platform_arch() {
|
||||
platform=$(get_platform_name)
|
||||
arch=$(uname -m)
|
||||
arch=${CROSS_ARCH:-$(uname -m)}
|
||||
if [[ $MSYSTEM != "" ]]; then
|
||||
if [[ $MSYSTEM == "MINGW64" ]]; then
|
||||
arch=x86_64
|
||||
else
|
||||
arch=i686
|
||||
fi
|
||||
elif [[ $CROSS_ARCH != "" ]]; then
|
||||
arch=$CROSS_ARCH
|
||||
fi
|
||||
echo "$arch"
|
||||
}
|
||||
|
||||
get_default_build_dir() {
|
||||
platform=$(get_platform_name)
|
||||
arch=$(get_platform_arch)
|
||||
platform="${1:-$(get_platform_name)}"
|
||||
arch="${2:-$(get_platform_arch)}"
|
||||
echo "build-$platform-$arch"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user