Put the changes to the generated build files into their .ac/.am source.

git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29075 a95241bf-73f2-0310-859d-f6bbb57e9c96
This should fix running the get_patches script. I don't really know how this could previously have worked. I can just guess that on the platform it worked, the MPFR lib wasn't built because it was preinstalled.
2026-02-05 00:13:15 +01:00 · 2009-01-28 16:09:58 +00:00 · 2009-01-28 13:05:13 +00:00 · 2009-01-28 03:07:50 +00:00
5 changed files with 22 additions and 3 deletions
--- a/gcc/gcc/Makefile.in
+++ b/gcc/gcc/Makefile.in
@@ -3265,7 +3265,7 @@ genprogmd = attr attrtab automata codes conditions config constants emit \
 $(genprogmd:%=build/gen%$(build_exeext)): $(BUILD_RTL) $(BUILD_ERRORS)

 # These programs need libs over and above what they get from the above list.
-build/genautomata$(build_exeext) : BUILD_LIBS += -lm
+build/genautomata$(build_exeext) : BUILD_LIBS += @math_library@

 # These programs are not linked with the MD reader.
 build/gengenrtl$(build_exeext) : $(BUILD_ERRORS)
--- a/gcc/gcc/configure
+++ b/gcc/gcc/configure
@@ -9064,6 +9064,15 @@ esac
 # --------


+# Configure -lm usage for host tools that need it
+math_library="-lm"
+case $host in
+  *-*-haiku*)
+    # no separate math library needed
+    math_library=
+    ;;
+esac
+
 # These libraries may be used by collect2.
 # We may need a special search path to get them linked.
 echo "$as_me:$LINENO: checking for collect2 libraries" >&5
@@ -24035,6 +24044,7 @@ s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 /@language_hooks@/r $language_hooks
 s,@language_hooks@,,;t t
+s,@math_library@,$math_library,;t t
 CEOF

 _ACEOF
--- a/gcc/gcc/configure.ac
+++ b/gcc/gcc/configure.ac
@@ -945,6 +945,15 @@ AC_C_BIGENDIAN
 # --------


+# Configure -lm usage for host tools that need it
+math_library="-lm"
+case $host in
+  *-*-haiku*)
+    # no separate math library needed
+    math_library=
+    ;;
+esac
+
 # These libraries may be used by collect2.
 # We may need a special search path to get them linked.
 AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs,
--- a/gcc/mpfr/Makefile.am
+++ b/gcc/mpfr/Makefile.am
@@ -33,7 +33,7 @@ mpfr_TEXINFOS = fdl.texi
 MAKEINFOFLAGS = --enable-encoding

 get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+	$(srcdir)/get_patches.sh > $@ || rm -f $@

 # Do not add get_patches.c to CLEANFILES so that this file doesn't
 # need to be (re)built as long as no patches are applied. Anyway the
--- a/gcc/mpfr/Makefile.in
+++ b/gcc/mpfr/Makefile.in
@@ -1666,7 +1666,7 @@ uninstall-info: uninstall-info-recursive


 get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+	$(srcdir)/get_patches.sh > $@ || rm -f $@

 tune:
 	$(MAKE) $(AM_MAKEFLAGS) tuneup$(EXEEXT)
Author	SHA1	Message	Date
Michael Lotz	71707d824a	Put the changes to the generated build files into their .ac/.am source. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29075 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-01-28 16:09:58 +00:00
Michael Lotz	87cbf3a69a	This should fix running the get_patches script. I don't really know how this could previously have worked. I can just guess that on the platform it worked, the MPFR lib wasn't built because it was preinstalled. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29073 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-01-28 13:05:13 +00:00
Michael Lotz	36de11649f	Don't blindly assume -lm presence. Add a check for the host and remove the -lm on Haiku so building should work natively. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29071 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-01-28 03:07:50 +00:00