From d298481418ca18736180df25bddaf303f5cf7fce Mon Sep 17 00:00:00 2001
From: letouzey
Date: Fri, 27 Feb 2009 14:37:51 +0000
Subject: Makefile: avoid building an empty contrib.cmxa

  Patch suggested by Yves. Now that the list of contrib to link statically
  in coqtop can be empty, we should avoid trying to build an empty
  contrib.cmxa, since this fails at least on MacOS.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11947 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile.common | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index acbc2feaab..6208685199 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -343,8 +343,11 @@ CONTRIBSTATIC:=\
         $(CCCMO)  $(FOCMO) $(SUBTACCMO) $(RTAUTOCMO) \
         $(FUNINDCMO)
 
+CONTRIBCMA:=contrib/contrib.cma
+
 ifneq ($(HASNATDYNLINK),false)
  CONTRIBSTATIC:=
+ CONTRIBCMA:=
  INITPLUGINS:=$(EXTRACTIONCMA) $(FOCMA) $(CCCMA) $(DPCMA) \
 	$(XMLCMA) $(FUNINDCMA) $(SUBTACCMA)
  PLUGINS:=$(INITPLUGINS) \
@@ -371,7 +374,7 @@ CMXA:=$(CMA:.cma=.cmxa)
 LINKCMO:=$(CONFIG) lib/lib.cma kernel/kernel.cma library/library.cma \
         pretyping/pretyping.cma interp/interp.cma proofs/proofs.cma \
         parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \
-        parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma
+        parsing/highparsing.cma tactics/hightactics.cma $(CONTRIBCMA)
 LINKCMOCMXA:=$(LINKCMO:.cma=.cmxa)
 LINKCMX:=$(LINKCMOCMXA:.cmo=.cmx)
 
-- 
cgit v1.2.3