Implement a new feature, BYTECODE_DESTINATION, to allow a user makefile to

specify where the bytecode library is to be installed. This allows the
default location ($prefix/lib) to be overridden, for special case runtime
libraries like the cfe runtime libs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18879 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index e2f5794db38b7ea95136411a8a4775a723f9e8a6..8327399f91b2120b34978ae9b5fd1f94abe6132c 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -594,13 +594,19 @@ ifneq ($(strip $(LibName.BCA)),)
        -$(Verb) $(RM) -f $(LibName.BCA)
 endif
 
-DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).a
+ifdef BYTECODE_DESTINATION
+BytecodeDestDir := $(BYTECODE_DESTINATION)
+else
+BytecodeDestDir := $(libdir)
+endif
+
+DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).a
 
 install-bytecode-local:: $(DestBytecodeLib)
 
 install-local:: $(DestBytecodeLib)
 
-$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BCA) 
+$(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) 
        $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib)
        $(Verb) $(INSTALL) $(LibName.BCA) $@