summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-24 19:58:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-24 19:58:35 +0000
commit01ec6c0c4cc6668ea060e8486724ad01fe403624 (patch)
tree2f3f831d7072b55ba781a88b4f048750414bbe1f /scripts
parent7c05d2806c7283a1849d8336b08c869bd6ad8b20 (diff)
downloadrtems-01ec6c0c4cc6668ea060e8486724ad01fe403624.tar.bz2
2001-05-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Remove AC_EXEEXT, treat .exe manually. * gccnewlib/base-gcc.add: Remove cpp. * gccnewlib/gccnewlib.add: mv cpp $target_alias-cpp, update copyright.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog7
-rw-r--r--scripts/configure.in24
-rw-r--r--scripts/gccnewlib/base-gcc.add1
-rw-r--r--scripts/gccnewlib/gccnewlib.add10
-rw-r--r--scripts/gccnewlib/target-gcc.add1
5 files changed, 33 insertions, 10 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 35cd8493da..f8c4194e15 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in: Remove AC_EXEEXT, treat .exe manually.
+ * gccnewlib/base-gcc.add: Remove cpp.
+ * gccnewlib/gccnewlib.add: mv cpp $target_alias-cpp, update
+ copyright.
+
2001-04-16 Joel Sherrill <joel@OARcorp.com>
* setup.def: Modified the binutils version to 2.11 and
diff --git a/scripts/configure.in b/scripts/configure.in
index af2b918ecf..f2f2cd0cb9 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -2,9 +2,19 @@
AC_INIT(binutils)
-AM_INIT_AUTOMAKE(rtems-scripts,20000610-0,no)
+AM_INIT_AUTOMAKE(rtems-scripts,20010516,no)
-AC_EXEEXT
+AC_CANONICAL_HOST
+
+# Check for .exe suffix.
+# With autoconf > 2.13 AC_EXEEXT is not what we want to use.
+AC_MSG_CHECKING([for executable suffix])
+case "$host" in
+i?86-*cygwin*)
+ EXEEXT=.exe ;;
+esac
+AC_SUBST(EXEEXT)
+AC_MSG_RESULT([$EXEEXT])
test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
. ./setup.cache
@@ -32,13 +42,11 @@ fi
AC_MSG_RESULT($RPM_SPECSdir)
AC_SUBST(RPM_SPECSdir)
-AC_CANONICAL_HOST
-
AC_MSG_CHECKING(for RPM CPU type)
-case "${host}" in
- i[[34567]]86-*linux*) RPM_CPU=i386 ;;
- i[[34567]]86-pc-cygwin*) RPM_CPU=i386 ;;
- sparc-sun-solaris*) RPM_CPU=sparc ;;
+case "$host" in
+ i?86-*linux*) RPM_CPU=i386 ;;
+ i?86-*cygwin*) RPM_CPU=i386 ;;
+ sparc-sun-solaris*) RPM_CPU=sparc ;;
*)
AC_MSG_ERROR([RPM CPU for ${host} is unknown])
;;
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index d6a4b65cb3..61b97ccea7 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -20,7 +20,6 @@ This is the files for gcc and newlib that are shared by all targets.
%doc /opt/rtems/info/libm.info*.gz
%dir /opt/rtems/bin
-/opt/rtems/bin/cpp@exe_ext@
/opt/rtems/bin/gcov@exe_ext@
%dir /opt/rtems/man
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index fe656e6c28..92ef38b59e 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -1,7 +1,7 @@
#
# spec file for building gcc for rtems
#
-# Copyright (c) 1999,2000 OARCorp, Huntsville, AL
+# Copyright (c) 1999,2000,2001 OARCorp, Huntsville, AL
#
# please send bugfixes or comments to joel@OARcorp.com
#
@@ -88,6 +88,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
# cd back to build/
cd ../..
+ # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
+ # Rename it to target_alias-cpp
+ if test -f $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@;
+ then
+ mv $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@ \
+ $RPM_BUILD_ROOT/opt/rtems/bin/@target_alias@-cpp@exe_ext@
+ fi
+
# gzip info files
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index 3f78469362..d147b8738b 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -16,6 +16,7 @@ This is gcc and newlib C Library for @target_alias@.
%doc /opt/rtems/man/man1/@target_alias@-gcc.1
%doc /opt/rtems/man/man1/@target_alias@-g++.1
+/opt/rtems/bin/@target_alias@-cpp@exe_ext@
/opt/rtems/bin/@target_alias@-c++@exe_ext@
/opt/rtems/bin/@target_alias@-g++@exe_ext@
/opt/rtems/bin/@target_alias@-gcc@exe_ext@