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

diff --git a/ChangeLog b/ChangeLog
index 05c9743da4f89514cdd16c70113da7f27f29b5ff..86becd862f4d3fa71ebd8fe9d65471e9fa0c7fe0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-25  Joern Rennecke  <amylaar@spamcop.net>
+
+       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  <amylaar@spamcop.net>
 
        PR libstdc++/36101, PR libstdc++/42813

diff --git a/configure b/configure
index 62a10553535a69b19f8a08e9793fcfdf97d248f3..282929cb90a957da49de9d4b1c2aa586644c30dc 100755 (executable)
--- 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 962a7a40806287cd91f3f5fe7bb3f922c895e5c7..4ea3f25283f57b1354ebf1bee4f701576b36f1f3 100644 (file)
--- 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!