diff options
author | nikita <nikita@NetBSD.org> | 2020-09-14 20:38:16 +0200 |
---|---|---|
committer | nikita <nikita@NetBSD.org> | 2020-09-14 20:38:16 +0200 |
commit | ea5627408e41592ac8750032de41b97038811d88 (patch) | |
tree | 851007eaf0e4e3ec6b97756e209b512792933b88 /scripts/travis/script.sh | |
parent | b8e9ccfa48a0b35e2c9dd560334237e591175be8 (diff) | |
parent | 5a1fc8d33808d7b22f57bdf9403cda7ff07b0670 (diff) | |
download | gnurl-ea5627408e41592ac8750032de41b97038811d88.tar.gz gnurl-ea5627408e41592ac8750032de41b97038811d88.tar.bz2 gnurl-ea5627408e41592ac8750032de41b97038811d88.zip |
Merge tag 'curl-7_71_1'
curl 7.71.1
Diffstat (limited to 'scripts/travis/script.sh')
-rwxr-xr-x | scripts/travis/script.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index dc694881b..d1088838b 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -85,8 +85,6 @@ if [ "$T" = "normal" ]; then make test-nonflaky fi if [ -n $CHECKSRC ]; then - echo "enable COPYRIGHTYEAR" > ./docs/examples/.checksrc - echo "enable COPYRIGHTYEAR" > ./include/gnurl/.checksrc make checksrc fi fi @@ -106,13 +104,8 @@ if [ "$T" = "iconv" ]; then fi if [ "$T" = "cmake" ]; then - if [ $TRAVIS_OS_NAME = linux ]; then - cmake -H. -Bbuild -DCURL_WERROR=ON - cmake --build build - else - cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON - cmake --build build - fi + cmake -H. -Bbuild -DCURL_WERROR=ON $C + cmake --build build fi if [ "$T" = "distcheck" ]; then |