diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-24 15:01:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-25 12:43:15 +0000 |
| commit | 341efcf5d827d9d2435947b406325d72b4f552fe (patch) | |
| tree | dc48dd6e687e93256732f88ef5dd8a1e88d2ba2d /solenv/gbuild/gbuild.mk | |
| parent | e5858fef1969a74f25435ea85cfb6f0fe7db4a1e (diff) | |
regain support for arm, ppc, s390x etc.
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 0c9896e5a1ed..9a2e5e0857fc 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -143,29 +143,23 @@ $(eval $(call gb_Helper_init_registries)) $(eval $(call gb_Helper_add_repositories,$(gb_REPOS))) $(eval $(call gb_Helper_collect_libtargets)) -# 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) +ifeq ($(OS),LINUX) +include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk +else ifeq ($(OS),DRAGONFLY) +include $(GBUILDDIR)/platform/dragonfly-$(CPUNAME).mk +else ifeq ($(OS),MACOSX) +include $(GBUILDDIR)/platform/macosx.mk +else ifeq ($(OS),SOLARIS) +include $(GBUILDDIR)/platform/solaris.mk +else ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) include $(GBUILDDIR)/platform/winmingw.mk else include $(GBUILDDIR)/platform/windows.mk endif else -ifeq ($(OS),SOLARIS) -include $(GBUILDDIR)/platform/solaris.mk -else -ifeq ($(OS),MACOSX) -include $(GBUILDDIR)/platform/macosx.mk -else $(eval $(call gb_Output_error,Unsupported OS: $(OS))) endif -endif -endif -endif include $(GBUILDDIR)/Tempfile.mk |