summaryrefslogtreecommitdiffstats
path: root/gcc/configure
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/configure')
-rwxr-xr-xgcc/configure7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/configure b/gcc/configure
index 8da69e3feee..ee0b741060a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6278,11 +6278,12 @@ if test x$enable_haifa != x; then
fi
# if $(exec_prefix) is not the same as $(prefix), then do not use a relative
-# directory to get to $gcc_tooldir.
+# directory to get to $gcc_tooldir. Also handle the case where the user did
+# not specify a value for exec_prefix.
# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
# make and thus we'd get different behavior depending on where we built the
# sources.
-if test x$exec_prefix = x$prefix; then
+if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
else
gcc_tooldir='$(exec_prefix)'/${target_alias}
@@ -6291,7 +6292,7 @@ fi
# Warn if using init_priority.
echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
-echo "configure:6295: checking whether to enable init_priority by default" >&5
+echo "configure:6296: checking whether to enable init_priority by default" >&5
if test x$enable_init_priority != xyes; then
enable_init_priority=no
fi
OpenPOWER on IntegriCloud