diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-03-21 23:21:20 +0100 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-03-21 23:27:06 +0100 |
| commit | faae793ae86558e42f948b89920665be402db1f8 (patch) | |
| tree | ca845392eab08500573c2bd3b1665d5de6a7c2b7 | |
| parent | 5c3f86934e7510a6666ab73d157187b9e975c0ee (diff) | |
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.
| -rw-r--r-- | RepositoryFixes.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 546643c8c840..8eeec62fa106 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -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)) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 358dfecc6783..41169fdf4286 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -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) |