Skip to content

Commit

Permalink
Restore MAKEOVERRIDES in libsanitizer
Browse files Browse the repository at this point in the history
	* Makefile.am (MAKEOVERRIDES): Restored.
	* asan/Makefile.am: Likewise.
	* interception/Makefile.am: Likewise.
	* sanitizer_common/Makefile.am: Likewise.
	* tsan/Makefile.am: Likewise.
	* Makefile.in: Regenerated.
	* asan/Makefile.in: Likewise.
	* interception/Makefile.in: Likewise.
	* sanitizer_common/Makefile.in: Likewise.
	* tsan/Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194450 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
hjl committed Dec 12, 2012
1 parent 4f34724 commit 8df53e6
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 0 deletions.
13 changes: 13 additions & 0 deletions libsanitizer/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2012-12-12 H.J. Lu <hongjiu.lu@intel.com>

* Makefile.am (MAKEOVERRIDES): Restored.
* asan/Makefile.am: Likewise.
* interception/Makefile.am: Likewise.
* sanitizer_common/Makefile.am: Likewise.
* tsan/Makefile.am: Likewise.
* Makefile.in: Regenerated.
* asan/Makefile.in: Likewise.
* interception/Makefile.in: Likewise.
* sanitizer_common/Makefile.in: Likewise.
* tsan/Makefile.in: Likewise.

2012-12-12 H.J. Lu <hongjiu.lu@intel.com>

* asan/Makefile.am (libasan_la_LIBADD): Use $(LIBSTDCXX_RAW_CXX_LDLAGS).
Expand Down
2 changes: 2 additions & 0 deletions libsanitizer/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ if USING_MAC_INTERPOSE
SUBDIRS = sanitizer_common asan
endif

MAKEOVERRIDES=

## ################################################################

1 change: 1 addition & 0 deletions libsanitizer/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
@TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common asan
@TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common asan tsan
@USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common asan
MAKEOVERRIDES =
all: all-recursive

.SUFFIXES:
Expand Down
2 changes: 2 additions & 0 deletions libsanitizer/asan/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDLAGS)

libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl

MAKEOVERRIDES=

## ################################################################

1 change: 1 addition & 0 deletions libsanitizer/asan/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ libasan_la_SOURCES = $(asan_files) $(am__append_2)
@USING_MAC_INTERPOSE_TRUE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
@USING_MAC_INTERPOSE_TRUE@ $(LIBSTDCXX_RAW_CXX_LDLAGS)
libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
MAKEOVERRIDES =
all: all-am

.SUFFIXES:
Expand Down
2 changes: 2 additions & 0 deletions libsanitizer/interception/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ interception_files = \

libinterception_la_SOURCES = $(interception_files)

MAKEOVERRIDES=

## ################################################################

1 change: 1 addition & 0 deletions libsanitizer/interception/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ interception_files = \
interception_win.cc

libinterception_la_SOURCES = $(interception_files)
MAKEOVERRIDES =
all: all-am

.SUFFIXES:
Expand Down
2 changes: 2 additions & 0 deletions libsanitizer/sanitizer_common/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ sanitizer_common_files = \

libsanitizer_common_la_SOURCES = $(sanitizer_common_files)

MAKEOVERRIDES=

## ################################################################

1 change: 1 addition & 0 deletions libsanitizer/sanitizer_common/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ sanitizer_common_files = \
sanitizer_win.cc

libsanitizer_common_la_SOURCES = $(sanitizer_common_files)
MAKEOVERRIDES =
all: all-am

.SUFFIXES:
Expand Down
2 changes: 2 additions & 0 deletions libsanitizer/tsan/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,7 @@ libtsan_la_SOURCES = $(tsan_files)
libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl

MAKEOVERRIDES=

## ################################################################

1 change: 1 addition & 0 deletions libsanitizer/tsan/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ tsan_files = \
libtsan_la_SOURCES = $(tsan_files)
libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
MAKEOVERRIDES =
all: all-am

.SUFFIXES:
Expand Down

0 comments on commit 8df53e6

Please sign in to comment.