.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 <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-02-15 11:59:16 +01:00
parent a8a48bb809
commit 29af250ac6
+2 -2
View File
@@ -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