Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc 20250116 #358

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Misc 20250116 #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2e78b
Makefile:retain CONFIGURE_HOST if set
liquidaty Dec 27, 2024
7fed09e
remove miscellaneous superflous stderr msg in zsv_get_temp_filename()
liquidaty Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/utils/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down