diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6a7f4416..6cd70cc6 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,5 +14,3 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Build libHttpClient - run: bash Build/libHttpClient.Linux/libHttpClient_Linux.bash -c Release diff --git a/Build/libHttpClient.Linux/curl_Linux.bash b/Build/libHttpClient.Linux/curl_Linux.bash index ecf30432..c59d17c3 100644 --- a/Build/libHttpClient.Linux/curl_Linux.bash +++ b/Build/libHttpClient.Linux/curl_Linux.bash @@ -45,5 +45,7 @@ make mkdir -p "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcurl.Linux cp -R "$PWD"/lib/.libs/* "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcurl.Linux -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi popd diff --git a/Build/libHttpClient.Linux/openssl_Linux.bash b/Build/libHttpClient.Linux/openssl_Linux.bash index fafce0e9..f398c546 100644 --- a/Build/libHttpClient.Linux/openssl_Linux.bash +++ b/Build/libHttpClient.Linux/openssl_Linux.bash @@ -50,7 +50,9 @@ else fi pushd $OPENSSL_SRC -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi sed -i -e 's/\r$//' Configure if [ "$CONFIGURATION" = "Debug" ]; then @@ -70,5 +72,7 @@ cp -R "$PWD"/libcrypto.a "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcrypto. mkdir -p "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libssl.Linux cp -R "$PWD"/libssl.a "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libssl.Linux -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi popd