Date: Thursday, January 4, 2007 @ 21:10:12
Author: marc
Path: /cvsroot/carob/carob/make-includes
Modified: freebsd.mk (1.3 -> 1.4) main.mk (1.1 -> 1.2)
Added comments.
------------+
freebsd.mk | 2 +-
main.mk | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
Index: carob/make-includes/freebsd.mk
diff -u carob/make-includes/freebsd.mk:1.3 carob/make-includes/freebsd.mk:1.4
--- carob/make-includes/freebsd.mk:1.3 Thu Jan 4 20:56:55 2007
+++ carob/make-includes/freebsd.mk Thu Jan 4 21:10:12 2007
@@ -4,10 +4,10 @@
# same thing for libiconv
override CPPFLAGS += -I/usr/local/include
override LDFLAGS += -L/usr/local/lib
-override LDLIBS += -liconv
# std::locale("en_US.UTF-8") does not seen to work on FreeBSD 6.2 PRERELEASE?
# fallback on Iconv
override CXXFLAGS += -DCAROB_USE_ICONV
+override LDLIBS += -liconv # prevents -ldl to be defined in
test/GNUmakefile... ugly
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.1 carob/make-includes/main.mk:1.2
--- carob/make-includes/main.mk:1.1 Thu Jan 4 20:41:34 2007
+++ carob/make-includes/main.mk Thu Jan 4 21:10:12 2007
@@ -1,3 +1,12 @@
+
+# Playing with overrides, declaration order and appending like this is
+# too subtle and unreliable.
+
+# The fix is to let the user play with "standard" CXXFLAGS and LDFLAGS
+# on the command line on one hand, and to have our own, private
+# OS_*_FLAGS, COMPILER_*_FLAGS, LINKER_*_FLAGS on the other hand.
+
+
# Defaults
COMPILER?=gcc
LINKER?=gnu
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
