From 29af250ac67459e310529adf3dd66517a873a83f Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 15 Feb 2021 11:59:16 +0100 Subject: [PATCH] .builds: remove cross compiler arguments A recent change to the native toolchain or system on the builder infrastructure made the arguments for the apple cross compiler needed always, not just in CGO_CFLAGS and CGO_LDFLAGS. Remove them altogether and rely on a recent change to the giouiorg repository for including them in the clang-ios and clang-macos wrappers. Signed-off-by: Elias Naur --- .builds/apple.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.builds/apple.yml b/.builds/apple.yml index e4ee397e..63a962df 100644 --- a/.builds/apple.yml +++ b/.builds/apple.yml @@ -56,10 +56,10 @@ tasks: - test_macos: | cd gio export PATH=/home/build/appletools/bin:$PATH - CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-macos CGO_CFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" CGO_LDFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" GOOS=darwin CGO_ENABLED=1 go build ./... + CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-macos GOOS=darwin CGO_ENABLED=1 go build ./... - test_ios: | cd gio - CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-ios CGO_CFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/iPhoneOS.sdk -arch arm64" CGO_LDFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/iPhoneOS.sdk -arch arm64" GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -tags ios ./... + CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-ios GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -tags ios ./... - install_gogio: | cd gio/cmd go install ./gogio