[complement-svn] SF.net SVN: complement: [1677] trunk/complement/explore/Makefiles
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1677] trunk/complement/explore/Makefiles
|
From: <com...@us...> - 2007-08-08 10:10:01
|
Revision: 1677
http://complement.svn.sourceforge.net/complement/?rev=1677&view=rev
Author: complement
Date: 2007-08-08 03:09:58 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
gmake/app/rules.mak: use special link string for Digital Mars
and Borland compilers, due to special pass of options and files
to linker for this OE;
gmake/gcc.mak, gmake/dmc.mak: use STLport's experience;
gmake/lib/gcc.mak: gcc 3.3 also may have bad libsupc++.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/rules.mak
trunk/complement/explore/Makefiles/gmake/dmc.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-08-08 10:09:58 UTC (rev 1677)
@@ -1,3 +1,13 @@
+2007-08-08 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/rules.mak: use special link string for Digital Mars
+ and Borland compilers, due to special pass of options and files
+ to linker for this OE;
+
+ * gmake/gcc.mak, gmake/dmc.mak: use STLport's experience;
+
+ * gmake/lib/gcc.mak: gcc 3.3 also may have bad libsupc++.
+
2007-07-12 Petr Ovtchenkov <pt...@is...>
* gmake/gcc.mak, gmake/top.mak: add include option for boost's
Modified: trunk/complement/explore/Makefiles/gmake/app/rules.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/app/rules.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -1,6 +1,6 @@
# -*- makefile -*- Time-stamp: <06/11/17 10:34:26 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -23,17 +23,27 @@
stldbg-static: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} ${ALLPRGS_STLDBG} $(EXTRA_POST_STLDBG)
endif
+ifeq ("$(findstring $(OSNAME),bcc dmc)","")
+define cpplnk_str
+$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(1) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+endef
+else
+define cpplnk_str
+$(LINK.cc) $(subst /,\,${START_OBJ} $(1) ${END_OBJ}, $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS) ${STDLIBS},,)
+endef
+endif
+
define prog_lnk
ifeq ($${_$(1)_C_SOURCES_ONLY},)
$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ))
$${$(1)_PRG_DBG}: $$($(1)_OBJ_DBG) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_DBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ_DBG))
ifndef WITHOUT_STLPORT
$${$(1)_PRG_STLDBG}: $$($(1)_OBJ_STLDBG) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_STLDBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ_STLDBG))
endif
else
$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
@@ -53,14 +63,14 @@
ifeq ("${_C_SOURCES_ONLY}","")
${PRG}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ))
${PRG_DBG}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ_DBG))
ifndef WITHOUT_STLPORT
${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ_STLDBG))
endif
else
${PRG}: $(OBJ) $(LIBSDEP)
Modified: trunk/complement/explore/Makefiles/gmake/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -19,7 +19,6 @@
CXX := dmc
CC := dmc
-RC := rcc
DEFS ?=
OPT ?=
@@ -64,7 +63,7 @@
CDEPFLAGS = -E -M
CCDEPFLAGS = -E -M
-RCFLAGS = -32 -I${STLPORT_INCLUDE_DIR} -DCOMP=dmc
+RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=dmc
release-shared : RCFLAGS += -DBUILD=r -DBUILD_INFOS="-o"
dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS="-gl -D_DEBUG"
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -43,7 +43,6 @@
GCC_APPLE_CC := 1
endif
else
-ifneq ($(OSNAME), windows)
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
ifeq ($(CXX_VERSION),)
@@ -55,7 +54,6 @@
CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
endif
-endif
DEFS ?=
OPT ?=
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -30,7 +30,7 @@
endif
ifeq ($(CXX_VERSION_MAJOR),3)
-# gcc before 3.3 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
+# gcc before 3.4 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
ifeq ($(CXX_VERSION_MINOR),0)
NOT_USE_NOSTDLIB := 1
endif
@@ -40,7 +40,10 @@
ifeq ($(CXX_VERSION_MINOR),2)
NOT_USE_NOSTDLIB := 1
endif
+ifeq ($(CXX_VERSION_MINOR),3)
+NOT_USE_NOSTDLIB := 1
endif
+endif
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
