From e883209bb7f4bef8c3c939f07982f31186e3914b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 24 Oct 2005 02:21:45 +0000 Subject: [PATCH] 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 --- Makefile.rules | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 9754ec01a95..9e88f7447a4 100644 --- a/Makefile.rules +++ b/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)