diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 19 insertions, 2 deletions
@@ -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 @@ -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 962a7a4..4ea3f25 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! |