summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-01-04 09:08:25 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-05 14:23:59 +0100
commitf79e96a2d3b58032c6f107ae31e97d4b25b8527c (patch)
treeef5e707c5eb3d84d9fe4a680abf41c52e3f54ff4
parent426d838d8e507e9076c6d53ec4c043125dbb40e6 (diff)
FIXME Review PowerPC hack
-rw-r--r--c/src/aclocal/rtems-bsp-includes.m49
1 files changed, 7 insertions, 2 deletions
diff --git a/c/src/aclocal/rtems-bsp-includes.m4 b/c/src/aclocal/rtems-bsp-includes.m4
index 394d50acd4..1897e02ea6 100644
--- a/c/src/aclocal/rtems-bsp-includes.m4
+++ b/c/src/aclocal/rtems-bsp-includes.m4
@@ -10,8 +10,13 @@ RTEMS_BSP_INCLUDE_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/include"
RTEMS_BSP_INCLUDE_BSP_ARCH="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include"
RTEMS_BSP_INCLUDE_BSP_ARCH_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP)/include"
RTEMS_BSP_INCLUDE_BSP_FAMILY="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
-RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_INCLUDE_BSP} ${RTEMS_BSP_INCLUDE_BSP_ARCH}"
-RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}"
+
+dnl The order is important because of the preinstall abuse in the PowerPC family of BSPs
+RTEMS_BSP_ARCH_INCLUDE=
+RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP}"
+RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}"
+RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH}"
+RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP}"
RTEMS_BSP_BUILD_INCLUDE="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"