Misc 20250116 (#358)

* Makefile:retain CONFIGURE_HOST if set * remove miscellaneous superflous stderr msg in zsv_get_temp_filename()
liquidaty · Jan 17, 2025 · b47d39f · b47d39f
1 parent 9db4bd2
commit b47d39f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;