From ad1e51700e69517f0bb8b14d3f7a23d2e33550b7 Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Mon, 25 Jan 2010 18:01:29 +0000 Subject: [PATCH] PR libstdc++/36101, PR libstdc++/42813 PR libstdc++/36101, PR libstdc++/42813 * configure.ac (bootstrap_target_libs): Make inclusion of target-libgomp conditional on libgomb being in target_configdirs. * configure: Regenerate. From-SVN: r156218 --- ChangeLog | 7 +++++++ configure | 7 ++++++- configure.ac | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05c9743da4f..86becd862f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-25 Joern Rennecke + + PR libstdc++/36101, PR libstdc++/42813 + * configure.ac (bootstrap_target_libs): Make inclusion of + target-libgomp conditional on libgomb being in target_configdirs. + * configure: Regenerate. + 2010-01-23 Joern Rennecke PR libstdc++/36101, PR libstdc++/42813 diff --git a/configure b/configure index 62a10553535..282929cb90a 100755 --- a/configure +++ b/configure @@ -6545,7 +6545,7 @@ fi stage1_languages=,c, # Target libraries that we bootstrap. -bootstrap_target_libs=,target-libgcc,target-libgomp, +bootstrap_target_libs=,target-libgcc, # Figure out what language subdirectories are present. # Look if the user specified --enable-languages="..."; if not, use @@ -7394,6 +7394,11 @@ fi target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'` +# If we are building libgomp, bootstrap it. +if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then + bootstrap_target_libs=${bootstrap_target_libs}target-libgomp, +fi + # Determine whether gdb needs tk/tcl or not. # Use 'maybe' since enable_gdbtk might be true even if tk isn't available # and in that case we want gdb to be built without tk. Ugh! diff --git a/configure.ac b/configure.ac index 962a7a40806..4ea3f25283f 100644 --- a/configure.ac +++ b/configure.ac @@ -1744,7 +1744,7 @@ fi stage1_languages=,c, # Target libraries that we bootstrap. -bootstrap_target_libs=,target-libgcc,target-libgomp, +bootstrap_target_libs=,target-libgcc, # Figure out what language subdirectories are present. # Look if the user specified --enable-languages="..."; if not, use @@ -2540,6 +2540,11 @@ fi target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'` +# If we are building libgomp, bootstrap it. +if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then + bootstrap_target_libs=${bootstrap_target_libs}target-libgomp, +fi + # Determine whether gdb needs tk/tcl or not. # Use 'maybe' since enable_gdbtk might be true even if tk isn't available # and in that case we want gdb to be built without tk. Ugh!