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 9f233af5ac5307083e925387bde5297435e92d91..a88e19a826699936c2c447ea7fe5bf995eb7915f 100644 (file)
--- 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 2680bb103288391129752b2dd28639d074f403f4..4e100ce2edb07555e72132cb21636693748a8d7b 100644 (file)
--- a/runtime/GCCLibraries/crtend/Makefile
+++ b/runtime/GCCLibraries/crtend/Makefile
@@ -19,6 +19,7 @@ LEVEL = ../../..
 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 4df154eb6fb7774a13026e4cfe8efdb39210a5d0..ba8033cdad2edebfcf42d78cda29b36b2187ab8c 100644 (file)
--- a/runtime/GCCLibraries/libc/Makefile
+++ b/runtime/GCCLibraries/libc/Makefile
@@ -11,6 +11,7 @@ LEVEL = ../../..
 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 fd9c98856fb6f7a507b409951d54a34fdb38c49f..af155e073330068e30777068deb06a25dc87014c 100644 (file)
--- a/runtime/GCCLibraries/libcurses/Makefile
+++ b/runtime/GCCLibraries/libcurses/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 f56b058703407df39fab7cd23fdb922f7217d105..8fb67f5c80a1d1af08f1a1d5317918b1bc43df41 100644 (file)
--- a/runtime/GCCLibraries/libgcc/Makefile
+++ b/runtime/GCCLibraries/libgcc/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 ddcbdb98f08b536a1c22b27cb4aaf94b0954d21e..b7d328b6e6ae178fc746bd2d17fbf89c63da77f1 100644 (file)
--- a/runtime/GCCLibraries/libgdbm/Makefile
+++ b/runtime/GCCLibraries/libgdbm/Makefile
@@ -11,6 +11,7 @@ LEVEL = ../../..
 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 02807e982462705c8f4237945dcf02d2a33f44e5..0868c0428b74ee090f354eb4d8eaeb4ac4785565 100644 (file)
--- a/runtime/GCCLibraries/libm/Makefile
+++ b/runtime/GCCLibraries/libm/Makefile
@@ -11,6 +11,7 @@ LEVEL = ../../..
 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 c2cfb84dc5903910d5f9b20d60c80e5bb6ad9021..82ce1256af577e9444e3d6021c06ff7009cdaf66 100644 (file)
--- a/runtime/GCCLibraries/libmalloc/Makefile
+++ b/runtime/GCCLibraries/libmalloc/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 69979028b170fc131578f54a3c45fb9f0fd6d45e..fe99b6118d595f17e11bd0c07fe69020c9656201 100644 (file)
--- a/runtime/GCCLibraries/libpthread/Makefile
+++ b/runtime/GCCLibraries/libpthread/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 b834052243afcda2c4aec2212042b15eb543dd58..e361ab271a88e4dd8a47922d3b14146d189183b1 100644 (file)
--- a/runtime/GCCLibraries/libtermcap/Makefile
+++ b/runtime/GCCLibraries/libtermcap/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 685944ebac42f7f14cda7bff19af31fbe64396e3..b5a175e72a2ae42bf3f3d23183d2468eea8e40be 100644 (file)
--- a/runtime/GCCLibraries/libucb/Makefile
+++ b/runtime/GCCLibraries/libucb/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 f804a25b9822b7a37c0076eaea3cca7a0901dbad..beb94f476614a15a6d25a09c35e7c22321d8dd2a 100644 (file)
--- a/runtime/GCCLibraries/libutempter/Makefile
+++ b/runtime/GCCLibraries/libutempter/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 16d7549237f4e61062bd8b0650ba90bf7691aafc..4f466f9739efb6ca61837ce426f9070f79bff1a2 100644 (file)
--- a/runtime/GCCLibraries/libutil/Makefile
+++ b/runtime/GCCLibraries/libutil/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../../..
 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 a0737699e52b06f971d862d9df9a374d07ce0d25..62b9070b73f4a8bafc608634c046f30627dfb615 100644 (file)
--- a/runtime/libdummy/Makefile
+++ b/runtime/libdummy/Makefile
@@ -11,5 +11,7 @@ LEVEL = ../..
 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 add0b25b22f51f825aa1c198edb2a7761b57f595..80cf4f74f0009167e2917a8eb5271297ad41f660 100644 (file)
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -13,5 +13,6 @@ SHARED_LIBRARY = 1
 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 9c8811a2b2c9ee68f0342036b4c4d0f329c641ac..31c5a2170dc6ad0603494b2cf8768bbb0284a05e 100644 (file)
--- 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