Kaydet (Commit) bf54aa59 authored tarafından Mike Kaganski's avatar Mike Kaganski

Properly filter(out) - pattern words are the first argument

https://www.gnu.org/software/make/manual/html_node/Text-Functions.html

Change-Id: Ifb1d92cd9c7b59360d296026f01aa54ed83ed9c3
Reviewed-on: https://gerrit.libreoffice.org/52604Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst a2f395af
......@@ -20,13 +20,13 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
$(if $(filter $(BUILD_TYPE),FUZZERS), \
$(if $(filter FUZZERS,$(BUILD_TYPE)), \
-DFORCE_DEFAULT_SIGNAL \
) \
$(if $(filter $(ALLOC),SYS_ALLOC)$(filter-out X$(ENABLE_RUNTIME_OPTIMIZATIONS),XTRUE), \
$(if $(filter SYS_ALLOC,$(ALLOC))$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)), \
-DFORCE_SYSALLOC \
) \
$(if $(filter $(OS),IOS), \
$(if $(filter IOS,$(OS)), \
-DNO_CHILD_PROCESSES \
) \
-DSAL_DLLIMPLEMENTATION \
......@@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_defs,sal,\
))
$(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
$(if $(filter ANDROID,$(OS)), \
lo-bootstrap \
) \
))
......@@ -60,15 +60,15 @@ $(eval $(call gb_Library_add_libs,sal,\
$(if $(filter-out ANDROID HAIKU WNT,$(OS)), \
-lpthread \
) \
$(if $(filter $(OS),LINUX), \
$(if $(filter LINUX,$(OS)), \
-ldl \
-lrt \
) \
$(if $(filter $(OS),SOLARIS), \
$(if $(filter SOLARIS,$(OS)), \
-lnsl \
-lsocket \
) \
$(if $(filter $(OS),HAIKU), \
$(if $(filter HAIKU,$(OS)), \
-lnetwork \
) \
))
......@@ -197,7 +197,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
endif
ifneq ($(filter $(OS),MACOSX IOS),)
ifneq ($(filter MACOSX IOS,$(OS)),)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/osxlocale \
))
......@@ -207,7 +207,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/backtrace \
))
endif
ifneq ($(filter $(CPUNAME),SPARC64 SPARC),)
ifneq ($(filter SPARC64 SPARC,$(CPUNAME)),)
$(eval $(call gb_Library_add_asmobjects,sal,\
sal/osl/unx/asm/interlck_sparc \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment