summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/Makefile5
-rw-r--r--llvm/utils/TableGen/Makefile1
-rw-r--r--llvm/utils/unittest/googletest/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/llvm/Makefile b/llvm/Makefile
index 058eabcf424..123595dc55e 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -71,10 +71,9 @@ ifeq ($(MAKECMDGOALS),unittests)
OPTIONAL_DIRS :=
endif
-# Don't install utils, examples, or projects they are only used to
-# build LLVM.
+# Use NO_INSTALL define of the Makefile of each directory for deciding
+# if the directory is installed or not
ifeq ($(MAKECMDGOALS),install)
- DIRS := $(filter-out utils, $(DIRS))
OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
endif
diff --git a/llvm/utils/TableGen/Makefile b/llvm/utils/TableGen/Makefile
index ba0e157ec38..7ea88de0559 100644
--- a/llvm/utils/TableGen/Makefile
+++ b/llvm/utils/TableGen/Makefile
@@ -9,7 +9,6 @@
LEVEL = ../..
TOOLNAME = tblgen
-NO_INSTALL = 1;
USEDLIBS = LLVMSupport.a LLVMSystem.a
REQUIRES_EH := 1
REQUIRES_RTTI := 1
diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile
index 6e262413cc4..d709878449a 100644
--- a/llvm/utils/unittest/googletest/Makefile
+++ b/llvm/utils/unittest/googletest/Makefile
@@ -22,4 +22,6 @@ ifeq ($(OS),MingW)
CPP.Flags += -DGTEST_OS_WINDOWS=1
endif
+NO_INSTALL = 1
+
include $(LEVEL)/Makefile.common
OpenPOWER on IntegriCloud