Merge pull request #75 from TheBlueMatt/main

Fix M1 build

diff --git a/genbindings.sh b/genbindings.sh
index 25bf60f8f336c38175c360e70f051fe4d3a969e1..5586569cec5b5069b94a401076263273de05c303 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -21,7 +21,8 @@ cd "$ORIG_PWD"
 # Generate (and reasonably test) C bindings
 
 # First we set various compiler flags...
-HOST_PLATFORM="$(rustc --version --verbose | grep "host:")"
+HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
+ENV_TARGET=$(echo $HOST_PLATFORM | sed 's/-/_/g')
 
 # Set path to include our rustc wrapper as well as cbindgen
 export LDK_RUSTC_PATH="$(which rustc)"
@@ -44,9 +45,9 @@ BASE_CFLAGS="$BASE_CFLAGS -frandom-seed=42"
 LOCAL_CFLAGS="-Wall -Wno-nullability-completeness -pthread -Iinclude/"
 
 HOST_OSX=false
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_PLATFORM" = "x86_64-apple-darwin" ]; then
        HOST_OSX=true
-elif [ "$HOST_PLATFORM" = "host: aarch64-apple-darwin" ]; then
+elif [ "$HOST_PLATFORM" = "aarch64-apple-darwin" ]; then
        HOST_OSX=true
 fi
 
@@ -54,8 +55,8 @@ BASE_HOST_CFLAGS="$BASE_CFLAGS"
 
 if [ "$HOST_OSX" = "true" ]; then
        export MACOSX_DEPLOYMENT_TARGET=10.9
-       LOCAL_CFLAGS="$LOCAL_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
-       BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
+       LOCAL_CFLAGS="$LOCAL_CFLAGS --target=$HOST_PLATFORM -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
+       BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS --target=$HOST_PLATFORM -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
        # Targeting aarch64 appears to be supported only starting with Big Sur, so check it before use
        clang -o /dev/null $BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14 genbindings_path_map_test_file.c &&
        export CFLAGS_aarch64_apple_darwin="$BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14" ||
@@ -64,12 +65,15 @@ fi
 
 rm genbindings_path_map_test_file.c
 
-ENV_TARGET=$(rustc --version --verbose | grep host | awk '{ print $2 }' | sed 's/-/_/g')
 case "$ENV_TARGET" in
        "x86_64"*)
                export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=sandybridge"
                export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
                ;;
+       "aarch64_apple_darwin")
+               export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14"
+               export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -mcpu=apple-a14"
+               ;;
        *)
                # Assume this isn't targeted at another host and build for the host's CPU.
                export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=native"
@@ -225,6 +229,7 @@ else
 fi
 
 # Build C++ class methods which call trait methods
+echo "Updating C++ header, this may take some time, especially on macOS"
 set +x # Echoing every command is very verbose here
 OLD_IFS="$IFS"
 export IFS=''
@@ -328,7 +333,7 @@ if [ "$2" = "true" ]; then
 fi
 
 # Then, check with memory sanitizer, if we're on Linux and have rustc nightly
-if [ "$HOST_PLATFORM" = "host: x86_64-unknown-linux-gnu" ]; then
+if [ "$HOST_PLATFORM" = "x86_64-unknown-linux-gnu" ]; then
        if cargo +nightly --version >/dev/null 2>&1; then
                LLVM_V=$(rustc +nightly --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }')
                if [ -x "$(which clang-$LLVM_V)" ]; then
@@ -431,7 +436,7 @@ if [ "$CLANG" != "" -a "$CLANGPP" = "" ]; then
 fi
 
 # Finally, if we're on OSX or on Linux, build the final debug binary with address sanitizer (and leave it there)
-if [ "$HOST_PLATFORM" = "host: x86_64-unknown-linux-gnu" -o "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_PLATFORM" = "x86_64-unknown-linux-gnu" -o "$HOST_PLATFORM" = "x86_64-apple-darwin" ]; then
        if [ "$CLANGPP" != "" ]; then
                if [ "$HOST_OSX" = "true" ]; then
                        # OSX sed is for some reason not compatible with GNU sed
@@ -536,17 +541,20 @@ if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
                LINK_ARG_FLAGS="$LINK_ARG_FLAGS -C link-arg="-isysroot$(xcrun --show-sdk-path)" -C link-arg=-mmacosx-version-min=10.9"
                RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14 -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-mcpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target aarch64-apple-darwin
        fi
-       export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
-       # Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts
-       cargo clean --release
-       CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
-
-       if [ "$2" = "true" ]; then
-               $CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
-               strip ./a.out
-               echo "C++ Bin size and runtime with cross-language LTO:"
-               ls -lha a.out
-               time ./a.out > /dev/null
+       # If we're on an M1 don't bother building X86 binaries
+       if [ "$HOST_PLATFORM" != "aarch64-apple-darwin" ]; then
+               export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+               # Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts
+               cargo clean --release
+               CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
+
+               if [ "$2" = "true" ]; then
+                       $CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
+                       strip ./a.out
+                       echo "C++ Bin size and runtime with cross-language LTO:"
+                       ls -lha a.out
+                       time ./a.out > /dev/null
+               fi
        fi
 else
        if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then