Changeset 12b0ada in rtems

Timestamp:

02/06/04 16:50:17 (20 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

f3d07e5

Parents:

aaed235

Message:

2004-02-06 Ralf Corsepius <corsepiu@…>

• configure.ac: Add powerpc's <bsp>/wrapup/Makefile.am detection hack.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)

c/src/ChangeLog

@@ +1 @@
+2004-02-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * configure.ac: Add powerpc's <bsp>/wrapup/Makefile.am detection
+        hack.
+
 2004-02-03      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/configure.ac

@@ -206 +206 @@
 # FIXME: We should use a feature based check, here
 AM_CONDITIONAL([HAS_LIBBSP],[test "$RTEMS_BSP_FAMILY" != "bare"])
-AM_CONDITIONAL([HAS_WRAPUP_LIBBSP],
-  [test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am])
+
+# FIXME: HACK
+# Temporarily, we need to consider 3 cases:
+# 1. 4.7-style: lib/libbsp/<cpu>/<bsp>/libbsp.a w/o wrapup/Makefile.am
+# 2. powerpc: lib/libbsp/<cpu>/<bsp>/libbsp.a w/ wrapup/Makefile.am
+# 3. 4.6-style: lib/libbsp/<cpu>/<bsp>/wrapup/$(ARCH)/libbsp.a w/ wrapup/Makefile.am
+
+AS_IF([test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am],
+  [AS_IF([grep ___libbsp_a $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am >/dev/null],
+    [HAS_WRAPUP_LIBBSP=no],
+    [HAS_WRAPUP_LIBBSP=yes])],
+  [HAS_WRAPUP_LIBBSP=no])
+AM_CONDITIONAL([HAS_WRAPUP_LIBBSP],[test $HAS_WRAPUP_LIBBSP = yes])
 AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])