From afe9832cb17a0fc28b44a5e240ea939ba22bcc7b Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 00:19:28 +0200 Subject: [PATCH] Use GNU_MAKE --- .travis.yml | 3 --- sodiumWrapper/makeMingwX86-64.sh | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff8d6b1..c0a97fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,9 +116,6 @@ matrix: script: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then $shell ./windowsBuild.sh; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish.sh; fi' - - make -j4 -C libsodium clean - - make -j4 -C libsodium - - make -j4 -C libsodium install cache: directories: - $HOME/.m2/ diff --git a/sodiumWrapper/makeMingwX86-64.sh b/sodiumWrapper/makeMingwX86-64.sh index 9f17086..9e76127 100755 --- a/sodiumWrapper/makeMingwX86-64.sh +++ b/sodiumWrapper/makeMingwX86-64.sh @@ -1,4 +1,9 @@ #!/bin/sh ./configureMingw64.sh echo "Configure done" - +$GNU_MAKE -j4 -C libsodium clean +$GNU_MAKE -j4 -C libsodium +$GNU_MAKE -j4 -C libsodium install +#make -j4 -C libsodium clean +#make -j4 -C libsodium +#make -j4 -C libsodium install