aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoern Rennecke <joern.rennecke@embecosm.com>2010-01-25 18:06:22 +0000
committerJoern Rennecke <joern.rennecke@embecosm.com>2010-01-25 18:06:22 +0000
commit2aa2364a8901583a5d0ffbbf64e7baed4a52f4e1 (patch)
treecaf2a9fe5354f72b24006cba31ab424bbe5f3b6a
parentc7f3c371135283f5376966704680c4f712b8c8a9 (diff)
downloadgdb-2aa2364a8901583a5d0ffbbf64e7baed4a52f4e1.zip
gdb-2aa2364a8901583a5d0ffbbf64e7baed4a52f4e1.tar.gz
gdb-2aa2364a8901583a5d0ffbbf64e7baed4a52f4e1.tar.bz2
gcc PR libstdc++/36101, gcc PR libstdc++/42813
* configure.ac (bootstrap_target_libs): Make inclusion of target-libgomp conditional on libgomb being in target_configdirs. * configure: Regenerate.
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac7
3 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 030b2da..01bfa10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-25 Joern Rennecke <amylaar@spamcop.net>
+
+ gcc PR libstdc++/36101, gcc 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>
gcc PR libstdc++/36101, gcc PR libstdc++/42813
diff --git a/configure b/configure
index 053a9f4..ad16b8f 100755
--- a/configure
+++ b/configure
@@ -6513,7 +6513,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
@@ -7362,6 +7362,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 1bb8f8a..75af4e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1730,7 +1730,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
@@ -2526,6 +2526,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!