Use the new BYTECODE_DESTINATION to override the default bytecode install
destination for this library so that it goes to $(cferuntime_libdir) rather
than just $(libdir). Normal bytecode libraries should be installed in the
$(libdir), but these ones are "special" because they're part of the the
C/C++ front end.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18882 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/runtime/GC/SemiSpace/Makefile b/runtime/GC/SemiSpace/Makefile
index 9f233af..a88e19a8 100644
--- a/runtime/GC/SemiSpace/Makefile
+++ b/runtime/GC/SemiSpace/Makefile
@@ -10,7 +10,7 @@
LEVEL = ../../..
BYTECODE_LIBRARY = 1
LIBRARYNAME = gcsemispace
-
+BYTECODE_DESTINATION = $(cferuntime_libdir)
EXPORTED_SYMBOL_FILE = $(BUILD_SRC_DIR)/../gc_exported_symbols.lst
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/crtend/Makefile b/runtime/GCCLibraries/crtend/Makefile
index 2680bb1..4e100ce 100644
--- a/runtime/GCCLibraries/crtend/Makefile
+++ b/runtime/GCCLibraries/crtend/Makefile
@@ -19,6 +19,7 @@
DONT_BUILD_RELINKED = 1
BYTECODE_LIBRARY = 1
LIBRARYNAME = crtend
+BYTECODE_DESTINATION = $(cferuntime_libdir)
# Note: We're using FAKE_SOURCES because the comp_*.c don't really exists.
# However this makefile builds comp_*.bc and that's what we want in the library.
diff --git a/runtime/GCCLibraries/libc/Makefile b/runtime/GCCLibraries/libc/Makefile
index 4df154e..ba8033c 100644
--- a/runtime/GCCLibraries/libc/Makefile
+++ b/runtime/GCCLibraries/libc/Makefile
@@ -11,6 +11,7 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = c
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libcurses/Makefile b/runtime/GCCLibraries/libcurses/Makefile
index fd9c988..af155e0 100644
--- a/runtime/GCCLibraries/libcurses/Makefile
+++ b/runtime/GCCLibraries/libcurses/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = curses
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libgcc/Makefile b/runtime/GCCLibraries/libgcc/Makefile
index f56b058..8fb67f5 100644
--- a/runtime/GCCLibraries/libgcc/Makefile
+++ b/runtime/GCCLibraries/libgcc/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = gcc
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libgdbm/Makefile b/runtime/GCCLibraries/libgdbm/Makefile
index ddcbdb9..b7d328b 100644
--- a/runtime/GCCLibraries/libgdbm/Makefile
+++ b/runtime/GCCLibraries/libgdbm/Makefile
@@ -11,6 +11,7 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = gdbm
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libm/Makefile b/runtime/GCCLibraries/libm/Makefile
index 02807e9..0868c04 100644
--- a/runtime/GCCLibraries/libm/Makefile
+++ b/runtime/GCCLibraries/libm/Makefile
@@ -11,6 +11,7 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = m
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libmalloc/Makefile b/runtime/GCCLibraries/libmalloc/Makefile
index c2cfb84..82ce125 100644
--- a/runtime/GCCLibraries/libmalloc/Makefile
+++ b/runtime/GCCLibraries/libmalloc/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = malloc
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libpthread/Makefile b/runtime/GCCLibraries/libpthread/Makefile
index 6997902..fe99b61 100644
--- a/runtime/GCCLibraries/libpthread/Makefile
+++ b/runtime/GCCLibraries/libpthread/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = pthread
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libtermcap/Makefile b/runtime/GCCLibraries/libtermcap/Makefile
index b834052..e361ab2 100644
--- a/runtime/GCCLibraries/libtermcap/Makefile
+++ b/runtime/GCCLibraries/libtermcap/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = termcap
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libucb/Makefile b/runtime/GCCLibraries/libucb/Makefile
index 685944e..b5a175e 100644
--- a/runtime/GCCLibraries/libucb/Makefile
+++ b/runtime/GCCLibraries/libucb/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = ucb
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libutempter/Makefile b/runtime/GCCLibraries/libutempter/Makefile
index f804a25b..beb94f4 100644
--- a/runtime/GCCLibraries/libutempter/Makefile
+++ b/runtime/GCCLibraries/libutempter/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = utempter
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/GCCLibraries/libutil/Makefile b/runtime/GCCLibraries/libutil/Makefile
index 16d7549..4f466f9 100644
--- a/runtime/GCCLibraries/libutil/Makefile
+++ b/runtime/GCCLibraries/libutil/Makefile
@@ -11,5 +11,6 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = util
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/libdummy/Makefile b/runtime/libdummy/Makefile
index a073769..62b9070 100644
--- a/runtime/libdummy/Makefile
+++ b/runtime/libdummy/Makefile
@@ -11,5 +11,7 @@
BYTECODE_LIBRARY = 1
DONT_BUILD_RELINKED = 1
LIBRARYNAME = dummy
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
+
diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile
index add0b25..80cf4f7 100644
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -13,5 +13,6 @@
LIBRARYNAME = profile_rt
EXTRA_DIST = exported_symbols.lst
EXPORTED_SYMBOL_FILE = $(BUILD_SRC_DIR)/exported_symbols.lst
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common
diff --git a/runtime/libtrace/Makefile b/runtime/libtrace/Makefile
index 9c8811a..31c5a21 100644
--- a/runtime/libtrace/Makefile
+++ b/runtime/libtrace/Makefile
@@ -10,6 +10,7 @@
LEVEL = ../..
BYTECODE_LIBRARY = 1
LIBRARYNAME = trace
+BYTECODE_DESTINATION = $(cferuntime_libdir)
include $(LEVEL)/Makefile.common