X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.sh;h=24aafa79367ab356cd9cf184bb45956bd6a1a1e6;hb=6ea339247734db7b67f07ee4c839d6c02d2747fa;hp=531180141b4ed054fd6cd8af72761f4fc6e0a35b;hpb=89c74053ac3a248ed1ef6b42130264be3fed1090;p=ldk-java diff --git a/genbindings.sh b/genbindings.sh index 53118014..24aafa79 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -76,8 +76,8 @@ fi COMMON_COMPILE="$CC -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign -Wdate-time -ffile-prefix-map=$(pwd)=" COMMON_CC="" -[ "$IS_MAC" = "true" -a "$2" != "wasm" ] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -mcpu=$LDK_TARGET_CPU" -[ "$IS_MAC" = "false" -a "$2" != "wasm" ] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -march=$LDK_TARGET_CPU -mtune=$LDK_TARGET_CPU" +[[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -mcpu=$LDK_TARGET_CPU" +[[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -march=$LDK_TARGET_CPU -mtune=$LDK_TARGET_CPU" [ "$IS_MAC" = "true" -a "$MACOS_SDK" != "" ] && COMMON_COMPILE="$COMMON_COMPILE -isysroot $MACOS_SDK" DEBUG_ARG="$3" @@ -125,11 +125,6 @@ if [ "$2" = "c_sharp" ]; then cat header.c >> c_sharp/bindings.c cat c_sharp/bindings.c.body >> c_sharp/bindings.c - IS_MAC=false - [ "$($CC --version | grep apple-darwin)" != "" ] && IS_MAC=true - IS_APPLE_CLANG=false - [ "$($CC --version | grep "Apple clang version")" != "" ] && IS_APPLE_CLANG=true - if is_gnu_sed; then sed -i "s/.*<\/version>/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/org.ldk.nuspec sed -i "s/.*<\/version>/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/package/services/metadata/core-properties/ldk.psmdcp