diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-08-07 17:11:52 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-08-08 00:19:21 +0200 |
| commit | 2429f45a9782eb56771c57688f85af79e8e383cc (patch) | |
| tree | e0c8d86099094f9cad3ef444f6f5aed2b28d9bd1 /MacOSX-Framework | |
| parent | 265717d27117a722b2b3ccc5f38de722c3a79070 (diff) | |
| download | curl-2429f45a9782eb56771c57688f85af79e8e383cc.tar.gz | |
TLS naming: fix more Winssl and Darwinssl leftovers
The CMake option is now called CMAKE_USE_SCHANNEL
The winbuild flag is USE_SCHANNEL
The CI jobs and build scripts only use the new names and the new name
options
Tests now require 'Schannel' (when necessary)
Closes #5795
Diffstat (limited to 'MacOSX-Framework')
| -rwxr-xr-x | MacOSX-Framework | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MacOSX-Framework b/MacOSX-Framework index 4cf23f0d0..73d9ed8b4 100755 --- a/MacOSX-Framework +++ b/MacOSX-Framework @@ -103,7 +103,7 @@ MINVER64='-mmacosx-version-min='$MACVER64 if test ! -z $SDK32; then echo "----Configuring libcurl for 32 bit universal framework..." make clean - ./configure --disable-dependency-tracking --disable-static --with-gssapi --with-darwinssl \ + ./configure --disable-dependency-tracking --disable-static --with-gssapi --with-secure-transport \ CFLAGS="-Os -isysroot $SDK32_DIR $ARCHES32" \ LDFLAGS="-Wl,-syslibroot,$SDK32_DIR $ARCHES32 -Wl,-headerpad_max_install_names" \ CC=$CC @@ -132,7 +132,7 @@ if test ! -z $SDK32; then popd make clean echo "----Configuring libcurl for 64 bit universal framework..." - ./configure --disable-dependency-tracking --disable-static --with-gssapi --with-darwinssl \ + ./configure --disable-dependency-tracking --disable-static --with-gssapi --with-secure-transport \ CFLAGS="-Os -isysroot $SDK64_DIR $ARCHES64" \ LDFLAGS="-Wl,-syslibroot,$SDK64_DIR $ARCHES64 -Wl,-headerpad_max_install_names" \ CC=$CC |