From 3aa98329a39af47a9193f75df2b50a4da6297628 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Thu, 6 Jun 2024 03:23:28 +0000 Subject: [PATCH] maybe the right flags --- src/Makevars.ucrt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt index f267d680..6eae83c6 100644 --- a/src/Makevars.ucrt +++ b/src/Makevars.ucrt @@ -1,11 +1,17 @@ ABSL_LIBS = -labsl_cord -labsl_cordz_info -labsl_cord_internal -labsl_cordz_functions -labsl_cordz_handle -labsl_crc_cord_state -labsl_crc32c -labsl_crc_internal -labsl_crc_cpu_detect -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_exponential_biased -labsl_synchronization -labsl_graphcycles_internal -labsl_kernel_timeout_internal -labsl_stacktrace -labsl_symbolize -labsl_malloc_internal -labsl_time -labsl_civil_time -labsl_time_zone -labsl_hash -labsl_city -labsl_bad_optional_access -labsl_bad_variant_access -labsl_low_level_hash -labsl_str_format_internal -labsl_strings -labsl_string_view -labsl_strings_internal -labsl_int128 -labsl_throw_delegate -labsl_demangle_internal -labsl_base -labsl_spinlock_wait -labsl_debugging_internal -labsl_raw_logging_internal -labsl_log_severity -ifeq (,$(shell pkg-config --version 2>/dev/null)) +ifeq (,$(shell pkg-config absl_base --libs 2>/dev/null)) ABSL_CFLAGS = -I../tools/dist/include - PKG_LIBS = -Ls2 -ls2static -L../tools/dist/lib $(ABSL_LIBS) -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32 -limagehlp + ABSL_LIB_FLAGS = -L../tools/dist/lib $(ABSL_LIBS) -limagehlp +else + ABSL_LIB_FLAGS = $(ABSL_LIBS) +endif + +ifeq (,$(shell pkg-config --version 2>/dev/null)) + PKG_LIBS = -Ls2 -ls2static $(ABSL_LIB_FLAGS) -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32 else - PKG_LIBS = -Ls2 -ls2static $(ABSL_LIBS) $(shell pkg-config --libs openssl) + PKG_LIBS = -Ls2 -ls2static $(ABSL_LIB_FLAGS) $(shell pkg-config --libs openssl) endif PKG_CPPFLAGS = $(ABSL_CFLAGS) -DSTRICT_R_HEADERS -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../src