[llvm-commits] [llvm] r142401 - in /llvm/trunk/tools: bugpoint-passes/ bugpoint/ edis/ gold/ llc/ lli/ llvm-ar/ llvm-as/ llvm-bcanalyzer/ llvm-cov/ llvm-diff/ llvm-dis/ llvm-dwarfdump/ llvm-extract/ llvm-ld/ llvm-link/ llvm-mc/ llvm-nm/ llvm-objdump/ llvm-prof/ llvm-ranlib/ llvm-rtdyld/ llvm-shlib/ llvm-size/ llvm-stub/ lto/ macho-dump/ opt/
Daniel Dunbar
daniel at zuster.org
Tue Oct 18 12:27:24 PDT 2011
Author: ddunbar
Date: Tue Oct 18 14:27:24 2011
New Revision: 142401
URL: http://llvm.org/viewvc/llvm-project?rev=142401&view=rev
Log:
build: Tidy up a bunch of tool Makefiles, and simplify where possible using the
new all-targets pseudo-component.
Modified:
llvm/trunk/tools/bugpoint-passes/Makefile
llvm/trunk/tools/bugpoint/Makefile
llvm/trunk/tools/edis/Makefile
llvm/trunk/tools/gold/Makefile
llvm/trunk/tools/llc/Makefile
llvm/trunk/tools/lli/Makefile
llvm/trunk/tools/llvm-ar/Makefile
llvm/trunk/tools/llvm-as/Makefile
llvm/trunk/tools/llvm-bcanalyzer/Makefile
llvm/trunk/tools/llvm-cov/Makefile
llvm/trunk/tools/llvm-diff/Makefile
llvm/trunk/tools/llvm-dis/Makefile
llvm/trunk/tools/llvm-dwarfdump/Makefile
llvm/trunk/tools/llvm-extract/Makefile
llvm/trunk/tools/llvm-ld/Makefile
llvm/trunk/tools/llvm-link/Makefile
llvm/trunk/tools/llvm-mc/Makefile
llvm/trunk/tools/llvm-nm/Makefile
llvm/trunk/tools/llvm-objdump/Makefile
llvm/trunk/tools/llvm-prof/Makefile
llvm/trunk/tools/llvm-ranlib/Makefile
llvm/trunk/tools/llvm-rtdyld/Makefile
llvm/trunk/tools/llvm-shlib/Makefile
llvm/trunk/tools/llvm-size/Makefile
llvm/trunk/tools/llvm-stub/Makefile
llvm/trunk/tools/lto/Makefile
llvm/trunk/tools/macho-dump/Makefile
llvm/trunk/tools/opt/Makefile
Modified: llvm/trunk/tools/bugpoint-passes/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint-passes/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint-passes/Makefile (original)
+++ llvm/trunk/tools/bugpoint-passes/Makefile Tue Oct 18 14:27:24 2011
@@ -7,10 +7,10 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-LIBRARYNAME = BugpointPasses
-LOADABLE_MODULE = 1
-USEDLIBS =
+LEVEL := ../..
+LIBRARYNAME := BugpointPasses
+LOADABLE_MODULE := 1
+USEDLIBS :=
# If we don't need RTTI or EH, there's no reason to export anything
# from this plugin.
Modified: llvm/trunk/tools/bugpoint/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/Makefile (original)
+++ llvm/trunk/tools/bugpoint/Makefile Tue Oct 18 14:27:24 2011
@@ -6,11 +6,10 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = bugpoint
-
-LINK_COMPONENTS := asmparser instrumentation scalaropts ipo \
- linker bitreader bitwriter
+LEVEL := ../..
+TOOLNAME := bugpoint
+LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
+ bitwriter
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/edis/Makefile (original)
+++ llvm/trunk/tools/edis/Makefile Tue Oct 18 14:27:24 2011
@@ -7,9 +7,9 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-LIBRARYNAME = EnhancedDisassembly
-LINK_LIBS_IN_SHARED = 1
+LEVEL := ../..
+LIBRARYNAME := EnhancedDisassembly
+LINK_LIBS_IN_SHARED := 1
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/EnhancedDisassembly.exports
Modified: llvm/trunk/tools/gold/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/gold/Makefile (original)
+++ llvm/trunk/tools/gold/Makefile Tue Oct 18 14:27:24 2011
@@ -7,8 +7,12 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-LIBRARYNAME = LLVMgold
+LEVEL := ../..
+LIBRARYNAME := LLVMgold
+LINK_COMPONENTS := support
+LINK_LIBS_IN_SHARED := 1
+SHARED_LIBRARY := 1
+LOADABLE_MODULE := 1
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/gold.exports
@@ -17,15 +21,9 @@
# early so we can set up LINK_COMPONENTS before including Makefile.rules
include $(LEVEL)/Makefile.config
-LINK_LIBS_IN_SHARED=1
-SHARED_LIBRARY = 1
-LOADABLE_MODULE = 1
-
-LINK_COMPONENTS := support
-
# Because off_t is used in the public API, the largefile parts are required for
# ABI compatibility.
-CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
+CXXFLAGS += -I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CXXFLAGS += $(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llc/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llc/Makefile (original)
+++ llvm/trunk/tools/llc/Makefile Tue Oct 18 14:27:24 2011
@@ -7,15 +7,9 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llc
+LEVEL := ../..
+TOOLNAME := llc
+LINK_COMPONENTS := all-targets bitreader asmparser
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) bitreader asmparser
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/lli/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/lli/Makefile (original)
+++ llvm/trunk/tools/lli/Makefile Tue Oct 18 14:27:24 2011
@@ -7,9 +7,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL := ../..
+LEVEL := ../..
TOOLNAME := lli
LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser selectiondag
-# Enable JIT support
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-ar/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-ar/Makefile (original)
+++ llvm/trunk/tools/llvm-ar/Makefile Tue Oct 18 14:27:24 2011
@@ -6,13 +6,13 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-ar
-LINK_COMPONENTS = archive
+LEVEL := ../..
+TOOLNAME := llvm-ar
+LINK_COMPONENTS := archive
REQUIRES_EH := 1
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-as/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-as/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-as/Makefile (original)
+++ llvm/trunk/tools/llvm-as/Makefile Tue Oct 18 14:27:24 2011
@@ -7,11 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-as
+LEVEL := ../..
+TOOLNAME := llvm-as
LINK_COMPONENTS := asmparser bitwriter
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-bcanalyzer/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-bcanalyzer/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-bcanalyzer/Makefile (original)
+++ llvm/trunk/tools/llvm-bcanalyzer/Makefile Tue Oct 18 14:27:24 2011
@@ -6,12 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-bcanalyzer
+LEVEL := ../..
+TOOLNAME := llvm-bcanalyzer
LINK_COMPONENTS := bitreader
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-cov/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cov/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cov/Makefile (original)
+++ llvm/trunk/tools/llvm-cov/Makefile Tue Oct 18 14:27:24 2011
@@ -7,12 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-
-TOOLNAME = llvm-cov
+LEVEL := ../..
+TOOLNAME := llvm-cov
LINK_COMPONENTS := instrumentation
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-diff/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-diff/Makefile (original)
+++ llvm/trunk/tools/llvm-diff/Makefile Tue Oct 18 14:27:24 2011
@@ -7,11 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-diff
+LEVEL := ../..
+TOOLNAME := llvm-diff
LINK_COMPONENTS := asmparser bitreader
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-dis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dis/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dis/Makefile (original)
+++ llvm/trunk/tools/llvm-dis/Makefile Tue Oct 18 14:27:24 2011
@@ -6,12 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-dis
+LEVEL := ../..
+TOOLNAME := llvm-dis
LINK_COMPONENTS := bitreader analysis
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-dwarfdump/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwarfdump/Makefile (original)
+++ llvm/trunk/tools/llvm-dwarfdump/Makefile Tue Oct 18 14:27:24 2011
@@ -6,12 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-dwarfdump
-LINK_COMPONENTS = DebugInfo Object
+LEVEL := ../..
+TOOLNAME := llvm-dwarfdump
+LINK_COMPONENTS := DebugInfo Object
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-extract/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-extract/Makefile (original)
+++ llvm/trunk/tools/llvm-extract/Makefile Tue Oct 18 14:27:24 2011
@@ -7,12 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-
-TOOLNAME = llvm-extract
+LEVEL := ../..
+TOOLNAME := llvm-extract
LINK_COMPONENTS := ipo bitreader bitwriter asmparser
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-ld/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ld/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-ld/Makefile (original)
+++ llvm/trunk/tools/llvm-ld/Makefile Tue Oct 18 14:27:24 2011
@@ -7,9 +7,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-
-TOOLNAME = llvm-ld
-LINK_COMPONENTS = ipo scalaropts linker archive bitwriter
+LEVEL := ../..
+TOOLNAME := llvm-ld
+LINK_COMPONENTS := ipo scalaropts linker archive bitwriter
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-link/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-link/Makefile (original)
+++ llvm/trunk/tools/llvm-link/Makefile Tue Oct 18 14:27:24 2011
@@ -6,12 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-link
-LINK_COMPONENTS = linker bitreader bitwriter asmparser
+LEVEL := ../..
+TOOLNAME := llvm-link
+LINK_COMPONENTS := linker bitreader bitwriter asmparser
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-mc/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Makefile (original)
+++ llvm/trunk/tools/llvm-mc/Makefile Tue Oct 18 14:27:24 2011
@@ -7,18 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-mc
+LEVEL := ../..
+TOOLNAME := llvm-mc
+LINK_COMPONENTS := all-targets MCDisassembler MCParser MC support
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) MCDisassembler MCParser MC support
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
+TOOL_NO_EXPORTS := 1
+include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-nm/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/Makefile (original)
+++ llvm/trunk/tools/llvm-nm/Makefile Tue Oct 18 14:27:24 2011
@@ -6,12 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-nm
-LINK_COMPONENTS = archive bitreader object
+LEVEL := ../..
+TOOLNAME := llvm-nm
+LINK_COMPONENTS := archive bitreader object
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-objdump/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/Makefile (original)
+++ llvm/trunk/tools/llvm-objdump/Makefile Tue Oct 18 14:27:24 2011
@@ -6,13 +6,12 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-objdump
-LINK_COMPONENTS = $(TARGETS_TO_BUILD) DebugInfo MC MCParser MCDisassembler \
- Object
+LEVEL := ../..
+TOOLNAME := llvm-objdump
+LINK_COMPONENTS := all-targets DebugInfo MC MCParser MCDisassembler Object
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-prof/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-prof/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-prof/Makefile (original)
+++ llvm/trunk/tools/llvm-prof/Makefile Tue Oct 18 14:27:24 2011
@@ -6,10 +6,10 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-prof
-LINK_COMPONENTS = bitreader analysis
+LEVEL := ../..
+TOOLNAME := llvm-prof
+LINK_COMPONENTS := bitreader analysis
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
Modified: llvm/trunk/tools/llvm-ranlib/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ranlib/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-ranlib/Makefile (original)
+++ llvm/trunk/tools/llvm-ranlib/Makefile Tue Oct 18 14:27:24 2011
@@ -7,12 +7,12 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-ranlib
-LINK_COMPONENTS = archive
+LEVEL := ../..
+TOOLNAME := llvm-ranlib
+LINK_COMPONENTS := archive
REQUIRES_EH := 1
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-rtdyld/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rtdyld/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rtdyld/Makefile (original)
+++ llvm/trunk/tools/llvm-rtdyld/Makefile Tue Oct 18 14:27:24 2011
@@ -7,17 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-rtdyld
+LEVEL := ../..
+TOOLNAME := llvm-rtdyld
+LINK_COMPONENTS := all-targets support MC object RuntimeDyld JIT
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
+TOOL_NO_EXPORTS := 1
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) support MC object RuntimeDyld JIT
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/llvm-shlib/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-shlib/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-shlib/Makefile (original)
+++ llvm/trunk/tools/llvm-shlib/Makefile Tue Oct 18 14:27:24 2011
@@ -7,13 +7,13 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
+LEVEL := ../..
LIBRARYNAME = LLVM-$(LLVMVersion)
-NO_BUILD_ARCHIVE = 1
-LINK_LIBS_IN_SHARED = 1
-SHARED_LIBRARY = 1
+NO_BUILD_ARCHIVE := 1
+LINK_LIBS_IN_SHARED := 1
+SHARED_LIBRARY := 1
include $(LEVEL)/Makefile.config
Modified: llvm/trunk/tools/llvm-size/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-size/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-size/Makefile (original)
+++ llvm/trunk/tools/llvm-size/Makefile Tue Oct 18 14:27:24 2011
@@ -6,10 +6,10 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-size
-LINK_COMPONENTS = object
+LEVEL := ../..
+TOOLNAME := llvm-size
+LINK_COMPONENTS := object
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
Modified: llvm/trunk/tools/llvm-stub/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-stub/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-stub/Makefile (original)
+++ llvm/trunk/tools/llvm-stub/Makefile Tue Oct 18 14:27:24 2011
@@ -7,7 +7,9 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = llvm-stub
+LEVEL := ../..
+TOOLNAME := llvm-stub
+LINK_COMPONENTS := object
+
include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Tue Oct 18 14:27:24 2011
@@ -7,22 +7,15 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-LIBRARYNAME = LTO
+LEVEL := ../..
+LIBRARYNAME := LTO
+LINK_COMPONENTS := all-targets ipo scalaropts linker bitreader bitwriter \
+ mcdisassembler
+LINK_LIBS_IN_SHARED := 1
+SHARED_LIBRARY := 1
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/lto.exports
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_LIBS_IN_SHARED = 1
-SHARED_LIBRARY = 1
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader \
- bitwriter mcdisassembler
-
include $(LEVEL)/Makefile.common
ifdef LLVM_VERSION_INFO
Modified: llvm/trunk/tools/macho-dump/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/macho-dump/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/macho-dump/Makefile (original)
+++ llvm/trunk/tools/macho-dump/Makefile Tue Oct 18 14:27:24 2011
@@ -7,17 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = macho-dump
+LEVEL := ../..
+TOOLNAME := macho-dump
+LINK_COMPONENTS := support object
# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := support object
+TOOL_NO_EXPORTS := 1
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common
Modified: llvm/trunk/tools/opt/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/Makefile?rev=142401&r1=142400&r2=142401&view=diff
==============================================================================
--- llvm/trunk/tools/opt/Makefile (original)
+++ llvm/trunk/tools/opt/Makefile Tue Oct 18 14:27:24 2011
@@ -6,9 +6,9 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = opt
+LEVEL := ../..
+TOOLNAME := opt
LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts ipo
include $(LEVEL)/Makefile.common
More information about the llvm-commits
mailing list