From b47d39fc1bfb72b50f509f6cb673e0a1b292c964 Mon Sep 17 00:00:00 2001 From: liquidaty Date: Thu, 16 Jan 2025 16:56:09 -0800 Subject: [PATCH] Misc 20250116 (#358) * Makefile:retain CONFIGURE_HOST if set * remove miscellaneous superflous stderr msg in zsv_get_temp_filename() --- app/Makefile | 9 ++++++--- app/utils/file.c | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Makefile b/app/Makefile index e9630b76..9af372e2 100644 --- a/app/Makefile +++ b/app/Makefile @@ -87,10 +87,12 @@ endif CFLAGS+= ${CFLAGS_PIC} -CONFIGURE_HOST= +CONFIGURE_HOST?= +ifeq ($(CONFIGURE_HOST),) ifneq ($(HOST),) CONFIGURE_HOST=$(HOST) endif +endif ifeq ($(WIN),0) BUILD_SUBDIR=$(shell uname)/${DBG_SUBDIR} @@ -108,7 +110,8 @@ ifeq ($(WIN),0) LDFLAGS += -sRESERVED_FUNCTION_POINTERS=4 -sALLOW_MEMORY_GROWTH=1 endif LDFLAGS += -sFORCE_FILESYSTEM=1 -lidbfs.js -sMAIN_MODULE - ifeq ($(NO_THREADING),0) + ifneq ($(NO_THREADING),1) + CFLAGS+=-pthread LDFLAGS += -sUSE_PTHREADS=1 -sPTHREAD_POOL_SIZE=2 endif endif @@ -168,7 +171,7 @@ ZSV_EXTRAS ?= ifneq ($(findstring emcc,$(CC)),) # emcc ZSV_EXTRAS=1 UTILS1+=emcc/fs_api - ifeq ($(NO_THREADING),0) + ifneq ($(NO_THREADING),1) LDFLAGS+=-pthread endif else # not emcc diff --git a/app/utils/file.c b/app/utils/file.c index a0edaa2f..bacdb9b9 100644 --- a/app/utils/file.c +++ b/app/utils/file.c @@ -41,7 +41,6 @@ char *zsv_get_temp_filename(const char *prefix) { if (uRetVal > 0) return strdup(szTempFileName); zsv_perror(lpTempPathBuffer); - fprintf(stderr, " prefix: %s\n", prefix); } return NULL;