Date: Monday, December 4, 2006 @ 11:58:56
Author: marc
Path: /cvsroot/carob/carob
Modified: Makefile (1.51 -> 1.52)
Removed 1.42 / CAROB-102 checkld quirk to avoid using ld version 2.14 on SuSE
(cannot reproduce)
----------+
Makefile | 10 +---------
1 files changed, 1 insertion(+), 9 deletions(-)
Index: carob/Makefile
diff -u carob/Makefile:1.51 carob/Makefile:1.52
--- carob/Makefile:1.51 Thu Nov 30 21:12:33 2006
+++ carob/Makefile Mon Dec 4 11:58:56 2006
@@ -102,21 +102,13 @@
test: all
$(MAKE) -C test
-${LIB_CAROB_LIB}: checkld ${OBJS}
+${LIB_CAROB_LIB}: ${OBJS}
${CXX} ${OBJS} ${LDFLAGS} -o ${LIB_CAROB_LIB}
- ${LN} -f ${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
