⛏️ index : buildtools.git

9d7404d60499d0b215836fae0c2a11e9be744548 [patch]

1d2cd9e6d042dd488fca98c2f91b3dd50e01c848

e649c97b4a2f7ec38efde476163e1bcd4d231afa

9d7404d60499d0b215836fae0c2a11e9be744548.tar.gz

gcc: Fix startfile search prefixes and bootstraps

* ac9c3b700 introduced modifications to configure.ac which added
  HYBRID_SECONDARY support to configure. Without these changes,
  HYBRID_SECONDARY = @HYBRID_SECONDARY@ in Makefile.in (configure
  doesn't template it out) which trickled into library search paths
  in various places. (if def, set to contents of HYBRID_SECONDARY)
* Fixes bootstraps across all architectures (that bootstrap ;-))

Diff

 gcc/gcc/configure    | 34 ++++++++++++++++++++++++++++++++--
 gcc/gcc/configure.ac | 20 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/gcc/gcc/configure b/gcc/gcc/configure
index 6121e16..f43e876 100755
--- a/gcc/gcc/configure
+++ a/gcc/gcc/configure
@@ -750,6 +750,7 @@
EXTRA_GCC_LIBS
GNAT_LIBEXC
COLLECT2_LIBS
build_math_library
CXXDEPMODE
DEPDIR
am__leading_dot
@@ -786,6 +787,7 @@
with_cpu
enable_multiarch
enable_multilib
HYBRID_SECONDARY
coverage_flags
valgrind_command
valgrind_path_defines
@@ -902,6 +904,7 @@
enable_coverage
enable_gather_detailed_mem_stats
enable_valgrind_annotations
with_hybrid_secondary
with_stabs
enable_multilib
enable_multiarch
@@ -1723,6 +1726,8 @@
  --with-demangler-in-ld  try to use demangler in GNU ld
  --with-gnu-as           arrange to work with GNU as
  --with-as               arrange to use the specified as (full pathname)
  --with-hybrid_secondary specify the packaging architecture for building a
                          secondary compiler for a Haiku hybrid system
  --with-stabs            arrange to use stabs instead of host debug format
  --with-dwarf2           force the default debug format to be DWARF 2
  --with-specs=SPECS      add SPECS to driver command-line processing
@@ -7385,6 +7390,18 @@
# Miscenalleous configure options
# -------------------------------

# handle --with-hybrid-secondary

# Check whether --with-hybrid_secondary was given.
if test "${with_hybrid_secondary+set}" = set; then :
  withval=$with_hybrid_secondary; HYBRID_SECONDARY=$withval
else
  HYBRID_SECONDARY=

fi



# With stabs

# Check whether --with-stabs was given.
@@ -9390,6 +9407,15 @@
# --------
# UNSORTED
# --------

# Configure -lm usage for host tools that need it
build_math_library="-lm"
case $build in
  *-*-haiku*)
    # no separate math library needed
    build_math_library=
    ;;
esac


# These libraries may be used by collect2.
@@ -11692,7 +11718,7 @@
    # default
    target_thread_file='single'
    ;;
  aix | dce | lynx | mipssde | posix | rtems | \
  aix | dce | haiku | lynx | mipssde | posix | rtems | \
  single | tpf | vxworks | win32)
    target_thread_file=${enable_threads}
    ;;
@@ -18170,7 +18196,7 @@
  lt_cv_dlopen_libs=

  case $host_os in
  beos*)
  beos* | haiku*)
    lt_cv_dlopen="load_add_on"
    lt_cv_dlopen_libs=
    lt_cv_dlopen_self=yes
@@ -18448,7 +18474,7 @@
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
#line 18451 "configure"
#line 18477 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
@@ -18554,7 +18580,7 @@
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
#line 18557 "configure"
#line 18583 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
diff --git a/gcc/gcc/configure.ac b/gcc/gcc/configure.ac
index b066cc6..3781237 100644
--- a/gcc/gcc/configure.ac
+++ a/gcc/gcc/configure.ac
@@ -771,6 +771,15 @@
# Miscenalleous configure options
# -------------------------------

# handle --with-hybrid-secondary
AC_ARG_WITH(hybrid_secondary,
  [AS_HELP_STRING([--with-hybrid_secondary],
                  [specify the packaging architecture for building a secondary compiler for a Haiku hybrid system])],
  [HYBRID_SECONDARY=$withval],
  [HYBRID_SECONDARY=]
)
AC_SUBST(HYBRID_SECONDARY)

# With stabs
AC_ARG_WITH(stabs,
[AS_HELP_STRING([--with-stabs],
@@ -1154,6 +1163,15 @@
# UNSORTED
# --------

# Configure -lm usage for host tools that need it
build_math_library="-lm"
case $build in
  *-*-haiku*)
    # no separate math library needed
    build_math_library=
    ;;
esac
AC_SUBST(build_math_library)

# These libraries may be used by collect2.
# We may need a special search path to get them linked.
@@ -1611,7 +1629,7 @@
    # default
    target_thread_file='single'
    ;;
  aix | dce | lynx | mipssde | posix | rtems | \
  aix | dce | haiku | lynx | mipssde | posix | rtems | \
  single | tpf | vxworks | win32)
    target_thread_file=${enable_threads}
    ;;