[llvm-branch-commits] [llvm-branch] r108920 - in /llvm/branches/Apple/Hartnell: ./ tools/Makefile tools/edis/Makefile

[Bob Wilson]

Author: bwilson
Date: Tue Jul 20 15:37:46 2010
New Revision: 108920

URL: http://llvm.org/viewvc/llvm-project?rev=108920&view=rev
Log:
Merge fix for DISABLE_EDIS.
--- Merging r108367 into '.':
U    tools/edis/Makefile
U    tools/Makefile

Modified:
    llvm/branches/Apple/Hartnell/   (props changed)
    llvm/branches/Apple/Hartnell/tools/Makefile
    llvm/branches/Apple/Hartnell/tools/edis/Makefile

Propchange: llvm/branches/Apple/Hartnell/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 15:37:46 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Morbo:102475
-/llvm/trunk:104174-104175,105453
+/llvm/trunk:104174-104175,105453,108367

Modified: llvm/branches/Apple/Hartnell/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hartnell/tools/Makefile?rev=108920&r1=108919&r2=108920&view=diff
==============================================================================
--- llvm/branches/Apple/Hartnell/tools/Makefile (original)
+++ llvm/branches/Apple/Hartnell/tools/Makefile Tue Jul 20 15:37:46 2010
@@ -49,9 +49,4 @@
   endif
 endif
 
-# Don't build edis if we explicitly disabled it.
-ifeq ($(DISABLE_EDIS),1)
-  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
-endif
-
 include $(LEVEL)/Makefile.common

Modified: llvm/branches/Apple/Hartnell/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hartnell/tools/edis/Makefile?rev=108920&r1=108919&r2=108920&view=diff
==============================================================================
--- llvm/branches/Apple/Hartnell/tools/edis/Makefile (original)
+++ llvm/branches/Apple/Hartnell/tools/edis/Makefile Tue Jul 20 15:37:46 2010
@@ -20,10 +20,12 @@
 include $(LEVEL)/Makefile.config
 
 ifeq ($(ENABLE_PIC),1)
+  ifneq ($(DISABLE_EDIS),1)
     ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
 	LINK_LIBS_IN_SHARED = 1
 	SHARED_LIBRARY = 1
     endif
+  endif
 endif
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler