--- ./wmake/rules/FreeBSD/c++.orig	Tue Nov  7 23:16:13 2006
+++ ./wmake/rules/FreeBSD/c++	Thu Apr 12 22:15:28 2007
@@ -1,21 +1,19 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -Wall -W -Wno-unused-parameter -Wold-style-cast
-
-CC          = g++ -m32
+c++WARN     = -Wall -W -Wno-unused-parameter
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-30
 
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC $(PTHREAD_CFLAGS)
 
 Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
 cxxtoo      = $(Ctoo)
 cctoo       = $(Ctoo)
 cpptoo      = $(Ctoo)
 
-LINK_LIBS   = $(c++DBUG)
+LINK_LIBS   = $(c++DBUG) -lstdc++ $(PTHREAD_LIBS)
 
 LINKLIBSO   = $(CC) $(c++FLAGS) -shared
 LINKEXE     = $(CC) $(c++FLAGS)
