Date: Monday, August 21, 2006 @ 15:35:51
Author: gilles
Path: /cvsroot/carob/carob
Modified: Makefile (1.41 -> 1.42)
Added ldd version check to prevent errors due to bug in ldd version 2.14
Fixes CAROB-102
----------+
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletion(-)
Index: carob/Makefile
diff -u carob/Makefile:1.41 carob/Makefile:1.42
--- carob/Makefile:1.41 Wed Jul 26 16:31:47 2006
+++ carob/Makefile Mon Aug 21 15:35:51 2006
@@ -93,13 +93,21 @@
test: all
$(MAKE) -C test
-${LIB_CAROB_LIB}: ${OBJS}
+${LIB_CAROB_LIB}: checkld ${OBJS}
${CXX} ${OBJS} ${LDFLAGS} -o ${LIB_CAROB_LIB}
- ${LN} ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
${LIB_CAROB_STATIC}: ${OBJS}
ar ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
+checkld:
+ifneq (,$(findstring 2.14,$(shell 2>&1 $(CXX) -Wl,--version)))
+ @echo "A bug in ld version 2.14 prevents Carob to work correctly"
+ @echo "Upgrade binutils to version 2.15 or later"
+ @echo "See CAROB-102 for more info."
+ @exit 1
+endif
+
clean: clean-lib clean-test clean-doc
clean-lib:
${RM} ${SRCDIR}/*.o ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
${LIB_CAROB_STATIC}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
