diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-02-07 17:31:15 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-02-07 17:31:15 +0100 |
| commit | f1de40264ddab180a16f4e5c23207118288ebf05 (patch) | |
| tree | ac33a265028c1c313c0e738aaa56519416b713e2 | |
| parent | 0fb314e647ff54cfaa5dea036e4ca4a527fbeeaa (diff) | |
| parent | d762d20f6366bcd035e0a5b65b9f1b2c62877a8a (diff) | |
| download | mullvadvpn-f1de40264ddab180a16f4e5c23207118288ebf05.tar.xz mullvadvpn-f1de40264ddab180a16f4e5c23207118288ebf05.zip | |
Merge branch 'less-dirty-working-directory'
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | wireguard/build-wireguard-go.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index af08672837..e59fffd85f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,6 @@ /windows/**/*.user /android/keystore.properties /android/local.properties +/wireguard/wireguard-go/libwg.h **/.vs/ *.bak diff --git a/wireguard/build-wireguard-go.sh b/wireguard/build-wireguard-go.sh index a4ff7feb49..e14ccd60f2 100755 --- a/wireguard/build-wireguard-go.sh +++ b/wireguard/build-wireguard-go.sh @@ -52,7 +52,7 @@ function build_windows { target_dir=../../build/lib/x86_64-pc-windows-msvc/ mkdir -p $target_dir - cp libwg.dll libwg.lib $target_dir + mv libwg.dll libwg.lib $target_dir popd } @@ -75,7 +75,7 @@ function build_unix { go build -v -o libwg.a -buildmode c-archive target_triple_dir="../../build/lib/$(unix_target_triple)" mkdir -p $target_triple_dir - cp libwg.a $target_triple_dir + mv libwg.a $target_triple_dir popd } |