summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2005-10-24 02:21:45 +0000
committerChris Lattner <sabre@nondot.org>2005-10-24 02:21:45 +0000
commit1b91cbd62729b8330ee866f95e6cb6ec35e2ffb4 (patch)
tree52c7e0136ef0f6cd770c0facfb408e4cf0446c90
parentdf88d79c08a34899a3f64089ce952d4cbd79b8df (diff)
downloadbcm5719-llvm-1b91cbd62729b8330ee866f95e6cb6ec35e2ffb4.tar.gz
bcm5719-llvm-1b91cbd62729b8330ee866f95e6cb6ec35e2ffb4.zip
Now that all libraries are built in either .o or .a form, make BUILD_ARCHIVE
default to turning off building of relinked objects. llvm-svn: 23939
-rw-r--r--llvm/Makefile.rules12
1 files changed, 10 insertions, 2 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index 9754ec01a95..9e88f7447a4 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -824,10 +824,18 @@ endif
#---------------------------------------------------------
# ReLinked Library Targets:
-# If the user didn't explicitly forbid building a
-# relinked then we provide targets for building them.
+# If the user explicitly requests a relinked library with
+# BUILD_RELINKED, provide it. Otherwise, if they specify
+# neither of BUILD_ARCHIVE or DONT_BUILD_RELINKED, give
+# them one.
#---------------------------------------------------------
+ifndef BUILD_ARCHIVE
ifndef DONT_BUILD_RELINKED
+BUILD_RELINKED = 1
+endif
+endif
+
+ifdef BUILD_RELINKED
all-local:: $(LibName.O)
OpenPOWER on IntegriCloud