From 90a80650d47991d3c622dbfa128e61bc4d030936 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 14 Feb 2021 15:01:04 +0100 Subject: embeddable-dll-service: switch to clang Signed-off-by: Jason A. Donenfeld --- embeddable-dll-service/build.bat | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/embeddable-dll-service/build.bat b/embeddable-dll-service/build.bat index 85d01ca6..0d2cbdbb 100644 --- a/embeddable-dll-service/build.bat +++ b/embeddable-dll-service/build.bat @@ -4,47 +4,32 @@ rem Copyright (C) 2019-2021 WireGuard LLC. All Rights Reserved. setlocal set BUILDDIR=%~dp0 -set PATH=%BUILDDIR%..\.deps\go\bin;%BUILDDIR%..\.deps;%PATH% +set PATH=%BUILDDIR%..\.deps\llvm-mingw\bin;%BUILDDIR%..\.deps\go\bin;%PATH% set PATHEXT=.exe cd /d %BUILDDIR% || exit /b 1 -if exist .prepared goto :build +if exist ..\.deps\prepared goto :build :installdeps call ..\build.bat || goto :error - pushd ..\.deps || goto :error - rem Mirror of https://musl.cc/i686-w64-mingw32-native.zip - call :download mingw-x86.zip https://download.wireguard.com/windows-toolchain/distfiles/i686-w64-mingw32-native-20200907.zip c972c00993727ac9bff83c799f4df65662adb95bc871fa30cfa8857e744a7fbd || goto :error - rem Mirror of https://musl.cc/x86_64-w64-mingw32-native.zip - call :download mingw-amd64.zip https://download.wireguard.com/windows-toolchain/distfiles/x86_64-w64-mingw32-native-20200907.zip e34fbacbd25b007a8074fc96f7e08f886241e0473a055987ee57483c37567aa5 || goto :error - popd || goto :error - copy /y NUL .prepared > NUL || goto :error :build set GOOS=windows + set GOARM=7 set GOPATH=%BUILDDIR%..\.deps\gopath set GOROOT=%BUILDDIR%..\.deps\go set CGO_ENABLED=1 set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601 call :build_plat x86 i686 386 || goto :error call :build_plat amd64 x86_64 amd64 || goto :error + rem Uncomment when cgo is implemented: + rem call :build_plat arm armv7 arm || goto :error + rem call :build_plat arm64 aarch64 arm64 || goto :error :success echo [+] Success exit /b 0 -:download - echo [+] Downloading %1 - curl -#fLo %1 %2 || exit /b 1 - echo [+] Verifying %1 - for /f %%a in ('CertUtil -hashfile %1 SHA256 ^| findstr /r "^[0-9a-f]*$"') do if not "%%a"=="%~3" exit /b 1 - echo [+] Extracting %1 - tar -xf %1 %~4 || exit /b 1 - echo [+] Cleaning up %1 - del %1 || exit /b 1 - goto :eof - :build_plat - set PATH=%BUILDDIR%..\.deps\%~2-w64-mingw32-native\bin;%PATH% set CC=%~2-w64-mingw32-gcc set GOARCH=%~3 mkdir %1 >NUL 2>&1 -- cgit v1.2.3-59-g8ed1b