diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 11:12:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-23 11:12:52 -0700 |
| commit | 8be8667d162a7bd04972e12f75bb71a8632391b9 (patch) | |
| tree | 9a8c983abb0ecfefbcc6a03bb6852fb4eada6c45 /gcc-4.7 | |
| parent | 9ee4bdfc5dc3972c5b3edb84a301347e1e157c51 (diff) | |
| parent | fcee90b38181973b4f5c6524b3259ff19b38be88 (diff) | |
| download | toolchain_gcc-8be8667d162a7bd04972e12f75bb71a8632391b9.tar.gz toolchain_gcc-8be8667d162a7bd04972e12f75bb71a8632391b9.tar.bz2 toolchain_gcc-8be8667d162a7bd04972e12f75bb71a8632391b9.zip | |
Merge "Fix missing gthr default.h in libstdc build"
Diffstat (limited to 'gcc-4.7')
| -rwxr-xr-x | gcc-4.7/libstdc++-v3/configure | 3 | ||||
| -rw-r--r-- | gcc-4.7/libstdc++-v3/include/Makefile.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc-4.7/libstdc++-v3/configure b/gcc-4.7/libstdc++-v3/configure index 0e9e28a59..092bc4a60 100755 --- a/gcc-4.7/libstdc++-v3/configure +++ b/gcc-4.7/libstdc++-v3/configure @@ -607,6 +607,7 @@ WARN_FLAGS OPTIMIZE_CXXFLAGS TOPLEVEL_INCLUDES GLIBCXX_INCLUDES +glibcxx_thread_h glibcxx_toolexeclibdir glibcxx_toolexecdir gxx_include_dir @@ -15090,7 +15091,7 @@ $as_echo_n "checking for thread model used by GCC... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $target_thread_file" >&5 $as_echo "$target_thread_file" >&6; } - +glibcxx_thread_h=gthr-$target_thread_file.h ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/gcc-4.7/libstdc++-v3/include/Makefile.in b/gcc-4.7/libstdc++-v3/include/Makefile.in index 9344d4670..a5085b20e 100644 --- a/gcc-4.7/libstdc++-v3/include/Makefile.in +++ b/gcc-4.7/libstdc++-v3/include/Makefile.in @@ -211,6 +211,7 @@ glibcxx_builddir = @glibcxx_builddir@ glibcxx_localedir = @glibcxx_localedir@ glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_srcdir = @glibcxx_srcdir@ +glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -1531,7 +1532,7 @@ ${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/gthr-posix.h \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < $< > $@ -${host_builddir}/gthr-default.h: ${toplevel_builddir}/libgcc/gthr-default.h \ +${host_builddir}/gthr-default.h: ${toplevel_srcdir}/libgcc/${glibcxx_thread_h} \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ |