Kaydet (Commit) faae793a authored tarafından Francois Tigeot's avatar Francois Tigeot

Treat DragonFly as Linux.

The new build system has introduced some new operating system
conditionals. Use the same path as Linux on DragonFly for now.
üst 5c3f8693
......@@ -28,7 +28,9 @@
# fixes for all the libraries that are named with too much creativity and do
# not follow any of the established nameschemes
ifeq ($(OS),LINUX)
# Make has no support for 'or' clauses in conditionals,
# we use a filter expression instead.
ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
......
......@@ -143,7 +143,9 @@ $(eval $(call gb_Helper_init_registries))
$(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
$(eval $(call gb_Helper_collect_libtargets))
ifeq ($(OS),LINUX)
# Make has no support for 'or' clauses in conditionals,
# we use a filter expression instead.
ifneq (,$(filter LINUX DRAGONFLY, $(OS)))
include $(GBUILDDIR)/platform/linux.mk
else
ifeq ($(OS),WNT)
......
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