summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2014-02-14 09:20:33 +0000
committerAlexey Samsonov <samsonov@google.com>2014-02-14 09:20:33 +0000
commit53aa4fda49f94920139300227786ac47c393f1ce (patch)
tree6d022d04ee279fe1afd89668f346e28a9e3e1559 /make
parent6d999e478fecb10dc43f20b85385d25cc239db0a (diff)
Move original compiler-rt functions (libgcc replacement) to lib/builtins directory
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201393 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
-rw-r--r--make/subdir.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/make/subdir.mk b/make/subdir.mk
index 6dadc7b61..f81c25f03 100644
--- a/make/subdir.mk
+++ b/make/subdir.mk
@@ -2,12 +2,13 @@
#
# Subdirectory makefiles must define:
# SubDirs - The subdirectories to traverse.
+#
+# Subdirectory makefiles may define:
+# ModuleName - The library name for objects in that directory.
# ObjNames - The objects available in that directory.
# Implementation - The library configuration the objects should go in (Generic
# or Optimized)
# Dependencies - Any dependences for the object files.
-#
-# Subdirectory makefiles may define:
# OnlyArchs - Only build the objects for the listed archs.
# OnlyConfigs - Only build the objects for the listed configurations.
@@ -20,9 +21,9 @@ endif
# The list of variables which are intended to be overridden in a subdirectory
# makefile.
-RequiredSubdirVariables := \
- ModuleName SubDirs ObjNames Implementation Dependencies
-OptionalSubdirVariables := OnlyArchs OnlyConfigs
+RequiredSubdirVariables := SubDirs
+OptionalSubdirVariables := ModuleName OnlyArchs OnlyConfigs \
+ ObjNames Implementation Dependencies
# Template: subdir_traverse_template subdir
define subdir_traverse_template