fixup: ...

Author: addaleax

.evergreen/compile-artifact.sh

@@ -71,7 +71,9 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
     "--shared-openssl-libname='"$MONGOSH_OPENSSL_LIBNAME"'",
     "--shared-zlib"
   ]'
-  export LD_LIBRARY_PATH=/tmp/m/opt/lib
+  # python3's ssl module may not work with the OpenSSL we built here,
+  # so prefix the devtools toolchain one
+  export LD_LIBRARY_PATH=/opt/devtools/lib:/tmp/m/opt/lib
 fi
 
 export PUPPETEER_SKIP_DOWNLOAD="true"

.evergreen/install-npm-deps.sh

@@ -5,11 +5,6 @@ export BASEDIR="$PWD/.evergreen"
 
 . "$BASEDIR/setup-env.sh"
 
-if [[ "${DISTRO_ID}" =~ ^(rhel|ubuntu1804) ]]; then
-  # RHEL and Ubuntu 18.04 use Python 3.6 which isn't supported by newer node-gyp versions
-  npm i node-gyp@9 --verbose --force
-fi
-
 npm ci --verbose
 echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"