Index: BOOK/cross-tools/arm/uclibc.xml
===================================================================
--- BOOK/cross-tools/arm/uclibc.xml (revision 8a7de9fb5c6c084dbe95db782277d69b9c14156a)
+++ BOOK/cross-tools/arm/uclibc.xml (revision 3b3960b365a954027e548eef6e5ee8007723b152)
@@ -40,10 +40,10 @@
For the ARM architecture, there are two different configurations
of uClibc that can be used: the EABI configuration and the OABI configuration.
- We will copy the one that corresponds with the $CLFS_ABI choice made earlier
- and use that as the base:
+ We will first copy the OABI configuration and, if the EABI was selected, modify
+ it to use the EABI:
-if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
-then cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN}.EABI .config; \
-else cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config; fi
+cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config
+if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
+then sed -i s/CONFIG_ARM_OABI/CONFIG_ARM_EABI/g .config; fi