[llvm-commits] [compiler-rt] r163413 - in /compiler-rt/trunk/lib/asan: Makefile.mk dynamic/Makefile.mk

[Daniel Dunbar]

Author: ddunbar
Date: Fri Sep  7 14:57:28 2012
New Revision: 163413

URL: http://llvm.org/viewvc/llvm-project?rev=163413&view=rev
Log:
build: Teach Makefile build system about asan/dynamic subdir.

Added:
    compiler-rt/trunk/lib/asan/dynamic/Makefile.mk
      - copied, changed from r163412, compiler-rt/trunk/lib/asan/Makefile.mk
Modified:
    compiler-rt/trunk/lib/asan/Makefile.mk

Modified: compiler-rt/trunk/lib/asan/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=163413&r1=163412&r2=163413&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/Makefile.mk Fri Sep  7 14:57:28 2012
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := asan
-SubDirs :=
+SubDirs := dynamic
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
 ObjNames := $(Sources:%.cc=%.o)

Copied: compiler-rt/trunk/lib/asan/dynamic/Makefile.mk (from r163412, compiler-rt/trunk/lib/asan/Makefile.mk)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/dynamic/Makefile.mk?p2=compiler-rt/trunk/lib/asan/dynamic/Makefile.mk&p1=compiler-rt/trunk/lib/asan/Makefile.mk&r1=163412&r2=163413&rev=163413&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)
+++ compiler-rt/trunk/lib/asan/dynamic/Makefile.mk Fri Sep  7 14:57:28 2012
@@ -1,4 +1,4 @@
-#===- lib/asan/Makefile.mk ---------------------------------*- Makefile -*--===#
+#===- lib/asan/dynamic/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,7 +7,7 @@
 #
 #===------------------------------------------------------------------------===#
 
-ModuleName := asan
+ModuleName := asan_dynamic
 SubDirs :=
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
@@ -17,9 +17,9 @@
 
 # FIXME: use automatic dependencies?
 Dependencies := $(wildcard $(Dir)/*.h)
-Dependencies += $(wildcard $(Dir)/../interception/*.h)
-Dependencies += $(wildcard $(Dir)/../interception/mach_override/*.h)
-Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
+Dependencies += $(wildcard $(Dir)/../../interception/*.h)
+Dependencies += $(wildcard $(Dir)/../../interception/mach_override/*.h)
+Dependencies += $(wildcard $(Dir)/../../sanitizer_common/*.h)
 
-# Define a convenience variable for all the asan functions.
-AsanFunctions := $(Sources:%.cc=%)
+# Define a convenience variable for the asan dynamic functions.
+AsanDynamicFunctions := $(Sources:%.cc=%)