diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-02-05 14:21:43 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-09 12:21:17 +0200 |
| commit | 67b21c517249ab160f5c74587cca8fec8e2ef5ff (patch) | |
| tree | 9337ea526f5d69b30ed7deb47aa0e5242c5a6f14 | |
| parent | catchall (diff) | |
| download | core-67b21c517249ab160f5c74587cca8fec8e2ef5ff.tar.gz core-67b21c517249ab160f5c74587cca8fec8e2ef5ff.zip | |
catchall
Change-Id: I2b10b0c78e81ac9332a0665037dbdaddec395bc4
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 5 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 0831846c3392..d9a348a42910 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -27,10 +27,9 @@ gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb # Linker and compiler optimize + debug flags are handled in LinkTarget.mk gb_LINKEROPTFLAGS := gb_LINKERSTRIPDEBUGFLAGS := +# This maps to g4, AKA sorce maps. The LO default would otherwise be g2! gb_DEBUGINFO_FLAGS = -g -gb_SUPPRESS_TESTS := $(true) - # cleanup addition JS and wasm files for binaries define gb_Executable_Executable_platform $(call gb_LinkTarget_add_auxtargets,$(2),\ @@ -50,6 +49,8 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ endef +gb_SUPPRESS_TESTS := $(true) + define gb_Library_get_rpath endef diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index fc38ed5b481a..3cf84ac21210 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -31,19 +31,13 @@ $(eval $(call gb_Module_add_targets,vcl,\ Package_skia_denylist ) \ $(if $(filter DESKTOP,$(BUILD_TYPE))$(filter EMSCRIPTEN,$(OS)), \ StaticLibrary_vclmain \ - $(if $(ENABLE_MACOSX_SANDBOX),, \ - $(if $(DISABLE_GUI),, \ - Executable_ui-previewer)) \ $(if $(filter EMSCRIPTEN LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ $(if $(DISABLE_GUI),, \ - Executable_vcldemo \ - Executable_icontest \ - Executable_visualbackendtest \ - Executable_mtfdemo ))) \ + Executable_vcldemo ))) \ )) $(eval $(call gb_Module_add_targets,vcl,\ - $(if $(filter-out ANDROID iOS WNT,$(OS)), \ + $(if $(filter-out EMSCRIPTEN ANDROID iOS WNT,$(OS)), \ Executable_svdemo \ Executable_fftester \ Executable_svptest \ |