From 2c932a3d97d655dcee21c6e8facb7a349787fd09 Mon Sep 17 00:00:00 2001 From: liquidaty Date: Tue, 25 Jun 2024 10:17:41 -0700 Subject: [PATCH] Revert "add zsv_fopen_wx to util/file; use exclusive write for zvs_file_copy (#173)" This reverts commit 50a7c836ae3a52a67125489687c18e9cb4dfa852. Revert 50a7c836ae3a52a67125489687c18e9cb4dfa852 --- app/Makefile | 2 +- configure | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Makefile b/app/Makefile index ea09863d..fdd7bf4d 100644 --- a/app/Makefile +++ b/app/Makefile @@ -175,7 +175,7 @@ CFLAGS+= -DUSE_JQ STATIC_LIB_FLAGS= ifneq ($(STATIC_LIBS),) - STATIC_LIB_FLAGS=${LDFLAGS_STATIC} + STATIC_LIB_FLAGS=-static ${STATIC_LIBS} endif STANDALONE_PFX=${BUILD_DIR}/bin/zsv_ diff --git a/configure b/configure index 3217e650..dab57013 100755 --- a/configure +++ b/configure @@ -466,7 +466,6 @@ _ACEOF tryflag CFLAGS_TRY -Werror=unknown-warning-option tryflag CFLAGS_TRY -Werror=unused-command-line-argument tryflag CFLAGS_TRY -Werror=ignored-optimization-argument -tryldflag LDFLAGS_STATIC -static tryldflag LDFLAGS_TRY -Werror=unknown-warning-option tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument tryldflag LDFLAGS_TRY -Werror=ignored-optimization-argument @@ -730,7 +729,6 @@ CFLAGS_PIC = $CFLAGS_PIC LDFLAGS_PIC = $LDFLAGS_PIC CFLAGS_PIE = $CFLAGS_PIE LDFLAGS_PIE = $LDFLAGS_PIE -LDFLAGS_STATIC = $LDFLAGS_STATIC USE_DEBUG_STDERR = $USE_DEBUG_STDERR CFLAGS_VECTORIZE = $CFLAGS_VECTORIZE CFLAGS_VECTORIZE_OPTIMIZED = $CFLAGS_VECTORIZE_OPTIMIZED