diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-20 00:49:49 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-20 00:49:49 +0100 |
| commit | 8bc30d66af5b920d6be2be09d2bf350c8b6aff96 (patch) | |
| tree | fd3bb121e20aaa9b0a35b172a922d38ea97b1b32 /solenv/gbuild | |
| parent | 71ea158708cbed57706f93be2647c4f0f0ba4e4f (diff) | |
Bit of a gbuild cleanup
Change-Id: I33f861fc00db3da1a0496a3bb1d590217b849605
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 579514beeee5..25d33abd52d6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -2272,7 +2272,7 @@ endif endef -# call gb_LinkTarget_add_prejs,linktarget,js_file +# call gb_LinkTarget_add_shellhtml,linktarget,js_file define gb_LinkTarget_add_shellhtml ifeq (EMSCRIPTEN,$(OS)) $(call gb_LinkTarget_get_target,$(1)) : T_SHELLHTML += $(2) diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index fec43f08e6e6..656ade720823 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -22,10 +22,9 @@ gb_EMSCRIPTEN_SHELL_HTML_FILE = \ gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) # Initial memory size and worker thread pool -gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4 +gb_EMSCRIPTEN_LDFLAGS := -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4 # To keep the link time (and memory) down, prevent all rewriting options from wasm-emscripten-finalize # See emscripten.py, finalize_wasm, modify_wasm = True diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7ea7a16461e3..f89e3f8e613b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -111,6 +111,8 @@ gb_CXXFLAGS_Wundef = -Wno-undef gb_CXXFLAGS_include := -include$(gb_SPACE) +gb_LinkTarget_LDFLAGS := $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) + ifeq ($(strip $(gb_GCOV)),YES) gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage @@ -157,8 +159,6 @@ endif gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) -gb_LinkTarget_LDFLAGS += $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) - ifneq ($(gb_ENABLE_PCH),) ifeq ($(COM_IS_CLANG),TRUE) # Clang by default includes in the PCH timestamps of the files it was |