[llvm-commits] [llvm] r101072 - in /llvm/trunk/tools: Makefile edis/Makefile

[Sean Callanan]

Author: spyffe
Date: Mon Apr 12 16:55:49 2010
New Revision: 101072

URL: http://llvm.org/viewvc/llvm-project?rev=101072&view=rev
Log:
Build system fixes.  llvm-mc depends on
libEnhancedDisassembly, so we now build the
static library in all cases (although the shared
library is only built when requested/possible).

Also, fixed a bug where edis wasn't properly
initializing the targets it uses.

Modified:
    llvm/trunk/tools/Makefile
    llvm/trunk/tools/edis/Makefile

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=101072&r1=101071&r2=101072&view=diff
==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Mon Apr 12 16:55:49 2010
@@ -15,7 +15,10 @@
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
-DIRS := llvm-config
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis
 PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
@@ -36,10 +39,6 @@
 ifeq ($(ENABLE_PIC),1)
   # No support for dynamic libraries on windows targets.
   ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
-    # libEnhancedDisassembly must be built ahead of llvm-mc
-    # because llvm-mc links against libEnhancedDisassembly
-    DIRS += edis
-
     # gold only builds if binutils is around.  It requires "lto" to build before
     # it so it is added to DIRS.
     ifdef BINUTILS_INCDIR
@@ -50,11 +49,6 @@
   endif
 endif
 
-# Only build edis if X86 target support is enabled.
-ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
-  PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
-endif
-
 # Don't build edis if we explicitly disabled it.
 ifeq ($(DISABLE_EDIS),1)
   PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))

Modified: llvm/trunk/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/Makefile?rev=101072&r1=101071&r2=101072&view=diff
==============================================================================
--- llvm/trunk/tools/edis/Makefile (original)
+++ llvm/trunk/tools/edis/Makefile Mon Apr 12 16:55:49 2010
@@ -17,8 +17,12 @@
 # early so we can set up LINK_COMPONENTS before including Makefile.rules
 include $(LEVEL)/Makefile.config
 
-LINK_LIBS_IN_SHARED = 1
-SHARED_LIBRARY = 1
+ifeq ($(ENABLE_PIC),1)
+    ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+	LINK_LIBS_IN_SHARED = 1
+	SHARED_LIBRARY = 1
+    endif
+endif
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler
 
@@ -55,8 +59,7 @@
 	EDIS_DEFINES := $(EDIS_DEFINES) -DEDIS_ARM
 endif
 
-CXXFLAGS := $(CXXFLAGS) 
-#$(EDIS_DEFINES)
+CXXFLAGS := $(CXXFLAGS) $(EDIS_DEFINES)
 
 EDInfo.inc:	$(TBLGEN)
 	$(Echo) "Building semantic information header"