Changed wrapper_macros.GNU to use LD for links instead of CXX. Changed

nearly all platform files to correspond by defining LD to be CXX.

29 files changed, 89 insertions, 62 deletions

diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU
index 058f464b2ad..cb001177e06 100644
--- a/include/makeinclude/platform_aix.GNU
+++ b/include/makeinclude/platform_aix.GNU
@@ -10,6 +10,7 @@
 CC	    = xlC
 CXX	    = xlC_r
 DLD	    = makeC++SharedLib
+LD	    = $(CXX)
 CPPFLAGS    += -qxcall -qtempinc
 SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
 ifdef SHLIB
diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU
index 8197edf7d16..74b53c5d86b 100644
--- a/include/makeinclude/platform_hpux.GNU
+++ b/include/makeinclude/platform_hpux.GNU
@@ -1,6 +1,7 @@
 CC		= /bin/cc
 CXX		= /usr/bin/CC
 DLD		= $(CXX)
+LD		= $(CXX) 
 PIC		= 
 ARFLAGS		= ruv
 RANLIB		= echo
diff --git a/include/makeinclude/platform_hpux_orbix.GNU b/include/makeinclude/platform_hpux_orbix.GNU
index e07a9cc993e..7fde5f5f05a 100644
--- a/include/makeinclude/platform_hpux_orbix.GNU
+++ b/include/makeinclude/platform_hpux_orbix.GNU
@@ -2,6 +2,7 @@
 CC		= /bin/cc
 CXX		= /usr/bin/CC
 DLD		= $(CXX)
+LD		= $(CXX) 
 INCLDIRS        = -I$(ORBIX_ROOT)/include
 PIC		= 
 ARFLAGS		= ruv
diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU
index f5edee5f16d..e6fb0f21e57 100644
--- a/include/makeinclude/platform_irix5.2.GNU
+++ b/include/makeinclude/platform_irix5.2.GNU
@@ -3,6 +3,7 @@ MAKE		= gmake
 CC		= gcc
 CXX		= g++
 DLD		= $(CXX)
+LD		= $(CXX) 
 LDFLAGS		+=
 LIBS		+= -ldl
 PIC		= -fpic
diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU
index 1d81ed6b7dd..92e1915f156 100644
--- a/include/makeinclude/platform_irix5.3_g++.GNU
+++ b/include/makeinclude/platform_irix5.3_g++.GNU
@@ -3,6 +3,7 @@
 CC              = gcc
 CXX             = gcc
 DLD             = $(CXX)
+LD		= $(CXX) 
 LDFLAGS         += -L$(WRAPPER_ROOT)/ace
 LIBS            += -lstdc++
 PIC             = -fpic
diff --git a/include/makeinclude/platform_irix5.3_sgic++.GNU b/include/makeinclude/platform_irix5.3_sgic++.GNU
index 9ea66283ce0..74315b3f4aa 100644
--- a/include/makeinclude/platform_irix5.3_sgic++.GNU
+++ b/include/makeinclude/platform_irix5.3_sgic++.GNU
@@ -7,6 +7,7 @@
 CC		= cc
 CXX		= CC
 DLD		= $(CXX)
+LD		= $(CXX) 
 CPPFLAGS        += -ptused -prelink +pp -woff 3203,3209,3161,3262,3665
 LDFLAGS		+= -rpath "$(WRAPPER_ROOT)/ace"
 LIBS		= 
diff --git a/include/makeinclude/platform_irix6.2_sgic++.GNU b/include/makeinclude/platform_irix6.2_sgic++.GNU
index 9bf0247f4f5..4d774f3c3e6 100644
--- a/include/makeinclude/platform_irix6.2_sgic++.GNU
+++ b/include/makeinclude/platform_irix6.2_sgic++.GNU
@@ -9,16 +9,17 @@
 # in the pthread library overriding symbols in the C library (which is
 # OK), and added libpthread.so to the link phase.
 
-CC             = cc
-CXX            = CC
-DLD            = $(CXX)
-CPPFLAGS       += -ptused -prelink +pp -D_SGI_MP_SOURCE -woff 3203,3209,3161,3262,3665
-LDFLAGS        += -rpath "$(WRAPPER_ROOT)/ace" -Wl,-woff,85
-LIBS           += -lpthread
-PIC            = -KPIC
-AR             = ar
-ARFLAGS	       = r
-RANLIB	       = echo
-SOFLAGS	       = -shared $(CPPFLAGS) -all
-SOBUILD	       = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-                 $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
+CC		= cc
+CXX		= CC
+DLD		= $(CXX)
+LD		= $(CXX) 
+CPPFLAGS	+= -ptused -prelink +pp -D_SGI_MP_SOURCE -woff 3203,3209,3161,3262,3665
+LDFLAGS		+= -rpath "$(WRAPPER_ROOT)/ace" -Wl,-woff,85
+LIBS		+= -lpthread
+PIC		= -KPIC
+AR		= ar
+ARFLAGS		= r
+RANLIB		= echo
+SOFLAGS		= -shared $(CPPFLAGS) -all
+SOBUILD		= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+		 $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index a87ef73202d..bae70684bec 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -4,6 +4,7 @@
 CC              = gcc -w
 CXX		= gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ 
 DLD             = $(CXX)
+LD		= $(CXX) 
 LIBS            = -lstdc++
 PIC             = -fPIC
 AR              = ar
diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU
index b7fa19806cb..df4b5ec2096 100644
--- a/include/makeinclude/platform_linux_pthread.GNU
+++ b/include/makeinclude/platform_linux_pthread.GNU
@@ -10,6 +10,7 @@
 CC              = gcc -w
 CXX		= gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
 DLD             = $(CXX)
+LD		= $(CXX) 
 LIBS            += -lpthreads -lstdc++
 PIC             = -fPIC
 AR              = ar
diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU
index 8912c2e9bd7..83ef4565abd 100644
--- a/include/makeinclude/platform_m88k.GNU
+++ b/include/makeinclude/platform_m88k.GNU
@@ -5,6 +5,7 @@ CC		= gcc -w
 CXX             = gcc -w -I. -fno-strict-prototypes -D__INLINE__
 CXX		+= -D__m88k__
 DLD		= $(CXX) 
+LD		= $(CXX) 
 INCLDIRS	+= -I$(WRAPPER_ROOT) -I.
 INCLDIRS	+= -I/devel/rmm/v1.0/local/src/threads/include
 LDFLAGS		+= -L $(WRAPPER_ROOT)/ace -L ./
diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2.GNU
index 478a4e072dd..72ae4735730 100644
--- a/include/makeinclude/platform_osf1_3.2.GNU
+++ b/include/makeinclude/platform_osf1_3.2.GNU
@@ -4,6 +4,7 @@ CC		= cxx -non_shared
 CXX		= cxx -x cxx -w0 -non_shared
 #DLD		= ld -non_shared
 DLD		= ld -shared
+LD		= $(CXX)
 LIBS		+= -lpthreads -lmach -lsys5 -lxti -ltli -lcxx -lexc -lc
 PIC		= -pic
 ARFLAGS		= ruv
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index 19b864127a9..044d260fb72 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -3,6 +3,7 @@
 CC		= cxx -g -pthread -ptr $(WRAPPER_ROOT)/ace/cxx_repository 
 CXX		= cxx -w0 -g -pthread -ptr $(WRAPPER_ROOT)/ace/cxx_repository 
 DLD		= $(CXX)
+LD		= $(CXX)
 #LIBS		+= -lpthreads -lmach -lsys5 -lxti -ltli -lcxx -lexc -lc
 LIBS		+= -ltli -lc_r
 PIC		= 
diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU
index 568f776c8bc..a01dc7062c6 100644
--- a/include/makeinclude/platform_sco-nothread.GNU
+++ b/include/makeinclude/platform_sco-nothread.GNU
@@ -6,6 +6,7 @@ CC              = gcc -w
 # for no threads
 CXX		= gcc -fno-implicit-templates -w -I. -fno-strict-prototypes -D__ACE_INLINE__
 DLD             = $(CXX)
+LD		= $(CXX)
 LIBS            = -lstdc++ -lsocket
 PIC             =
 AR              = ar
diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU
index fa959dce8b2..8f761a8411c 100644
--- a/include/makeinclude/platform_sunos4_g++.GNU
+++ b/include/makeinclude/platform_sunos4_g++.GNU
@@ -5,6 +5,7 @@
 CC	= gcc 
 CXX	= gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo 
 DLD	= /bin/ld
+LD	= $(CXX)
 #
 # for G++ v2.6.0
 LIBS	+= -lstdc++
diff --git a/include/makeinclude/platform_sunos4_lucid.GNU b/include/makeinclude/platform_sunos4_lucid.GNU
index 044f8764dd1..b285daba2d8 100644
--- a/include/makeinclude/platform_sunos4_lucid.GNU
+++ b/include/makeinclude/platform_sunos4_lucid.GNU
@@ -4,6 +4,7 @@ CXX		= lcc
 CFLAGS		= -Xa       # use ANSI c complier
 CCFLAGS		= -XF -Xpt- # use c++ ARM compiler with auto templates turned off
 DLD		= /bin/ld
+LD		= $(CXX)
 LIBS		+= 
 PIC		= -pic
 ARFLAGS		= ruv
diff --git a/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/include/makeinclude/platform_sunos4_sunc++3.x.GNU
index 8e3909d090b..21ea974989b 100644
--- a/include/makeinclude/platform_sunos4_sunc++3.x.GNU
+++ b/include/makeinclude/platform_sunos4_sunc++3.x.GNU
@@ -2,6 +2,7 @@
 CC		= cc
 CXX		= CC
 DLD		= /bin/ld
+LD		= $(CXX)
 LIBS		+= 
 PIC		= -pic
 AR		= ar
diff --git a/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/include/makeinclude/platform_sunos4_sunc++4.x.GNU
index 250fd133a18..79c9adb1dfb 100644
--- a/include/makeinclude/platform_sunos4_sunc++4.x.GNU
+++ b/include/makeinclude/platform_sunos4_sunc++4.x.GNU
@@ -2,6 +2,7 @@
 CC              = cc
 CXX             = CC
 DLD             = $(CXX)
+LD		= $(CXX)
 LIBS            += 
 AR              = CC
 ARFLAGS         = -xar -o
diff --git a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU
index 6a282ff451b..6112508e091 100644
--- a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU
+++ b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU
@@ -2,6 +2,7 @@
 CC              = cc
 CXX             = CC
 DLD             = $(CXX)
+LD		= $(CXX)
 LIBS            += 
 INCLDIRS        = -I$(ORBIX_ROOT)/include
 AR              = CC
diff --git a/include/makeinclude/platform_sunos5_centerline.GNU b/include/makeinclude/platform_sunos5_centerline.GNU
index 3bf22121c8b..a214ebfa007 100644
--- a/include/makeinclude/platform_sunos5_centerline.GNU
+++ b/include/makeinclude/platform_sunos5_centerline.GNU
@@ -2,6 +2,7 @@
 CC		= cc
 CXX		= CC -mt
 DLD		= $(CXX) -mt
+LD		= $(CXX) -mt
 LIBS		+= -lsocket -ldl -lnsl -lgen
 PIC		= -PIC
 #AR		= CC
diff --git a/include/makeinclude/platform_sunos5_centerline_orbix.GNU b/include/makeinclude/platform_sunos5_centerline_orbix.GNU
index cd68c89b609..1432aab5d3f 100644
--- a/include/makeinclude/platform_sunos5_centerline_orbix.GNU
+++ b/include/makeinclude/platform_sunos5_centerline_orbix.GNU
@@ -2,6 +2,7 @@
 CC		= cc
 CXX		= CC -mt
 DLD		= $(CXX) -mt 
+LD		= $(CXX) -mt
 INCLDIRS	= -I$(ORBIX_ROOT)/include
 LDFLAGS		+= -L$(ORBIX_ROOT)/lib
 LIBS		+= -lITsrv -lsocket -ldl -lnsl -lgen
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 09370aa718a..8790c0a1e44 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -2,21 +2,22 @@
 #
 # SOBUILD - compile into .so directly
 #
-CC	= gcc 
-CXX	= gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ -Wall -Wpointer-arith -Winline 
-DLD	= $(CXX)
-LDFLAGS	+= -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs
-LIBS	+= -lsocket -ldl -lstdc++ -lgen -lnsl -lthread -lw
-PIC	= -fpic
-AR	= ar
-ARFLAGS	= ruv
-RANLIB	= /bin/true
-SOFLAGS	= -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+CC		= gcc 
+CXX		= gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ -Wall -Wpointer-arith -Winline 
+DLD		= $(CXX)
+LD		= $(CXX)
+LDFLAGS		+= -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs
+LIBS		+= -lsocket -ldl -lstdc++ -lgen -lnsl -lthread -lw
+PIC		= -fpic
+AR		= ar
+ARFLAGS		= ruv
+RANLIB		= /bin/true
+SOFLAGS		= -G $(CPPFLAGS)
+SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 # SOLINK 	= cp $< $@
 # SOLINK 	= ln -s $< $@
 # SOLINK	= $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB	= (echo "int main() { return 0; }" > gcctemp.c && \
-	  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
-	  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
-	  status=$$?; rm -f gcctemp*; exit $$status)
+PRELIB		= (echo "int main() { return 0; }" > gcctemp.c && \
+		  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
+		  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+		  status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index dc5ebf180ab..7b1d0e83c40 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -3,6 +3,7 @@
 CC		= cc
 CXX		= CC +w -mt -pta -noex # This option should solve some evil problems with Solaris
 DLD		= $(CXX) 
+LD		= $(CXX)
 LDFLAGS		+= -R $(WRAPPER_ROOT)/ace 
 LIBS		+= -lsocket -ldl -lnsl -lgen # -lposix4
 PIC		= -PIC
diff --git a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
index 69e9895dfb7..78b42597cf3 100644
--- a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
@@ -3,6 +3,7 @@
 CC              = cc
 CXX             = CC -mt -noex -pta
 DLD             = $(CXX) 
+LD		= $(CXX)
 LDFLAGS         += -R $(WRAPPER_ROOT)/ace 
 LIBS            += -lsocket -ldl -lnsl -lgen
 PIC             = -PIC
diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
index f76fc318f99..3940c534b46 100644
--- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
@@ -3,6 +3,7 @@
 CC		= cc
 CXX		= CC -mt -pta -noex
 DLD		= $(CXX)
+LD		= $(CXX)
 INCLDIRS	= -I$(ORBIX_ROOT)/include
 PIC		= -PIC
 LDFLAGS		+= $(PIC) -L$(ORBIX_ROOT)/lib -R $(WRAPPER_ROOT)/ace -R $(ORBIX_ROOT)/lib
diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU
index 6fa91f36398..5f468a5ff82 100644
--- a/include/makeinclude/platform_sunos5_x86_g++.GNU
+++ b/include/makeinclude/platform_sunos5_x86_g++.GNU
@@ -2,21 +2,22 @@
 #
 # SOBUILD - compile into .so directly
 #
-CC	= gcc 
-CXX	= gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo 
-DLD	= $(CXX)
-LDFLAGS	+= -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs
-LIBS	+= -lsocket -ldl -lstdc++ -lgen -lnsl -lthread -lw
-PIC	= -fpic
-AR	= ar
-ARFLAGS	= ruv
-RANLIB	= /bin/true
-SOFLAGS	= -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+CC		= gcc 
+CXX		= gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo 
+DLD		= $(CXX)
+LD		= $(CXX)
+LDFLAGS		+= -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs
+LIBS		+= -lsocket -ldl -lstdc++ -lgen -lnsl -lthread -lw
+PIC		= -fpic
+AR		= ar
+ARFLAGS		= ruv
+RANLIB		= /bin/true
+SOFLAGS		= -G $(CPPFLAGS)
+SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 # SOLINK 	= cp $< $@
 # SOLINK 	= ln -s $< $@
 # SOLINK	= $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB	= (echo "int main() { return 0; }" > gcctemp.c && \
-	  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
-	  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
-	  status=$$?; rm -f gcctemp*; exit $$status)
+PRELIB		= (echo "int main() { return 0; }" > gcctemp.c && \
+		  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
+		  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+		  status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
index 5dffb41a6a7..8b79550b670 100644
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ b/include/makeinclude/platform_unixware_g++.GNU
@@ -2,20 +2,21 @@
 #
 # SOBUILD - compile into .so directly
 #
-CC	= gcc -w
-CXX	= gcc -I. -D__ACE_INLINE__      # -w -fno-strict-prototypes
-DLD	= $(CXX)
-LDFLAGS += -L$(WRAPPER_ROOT)/ace -L./ -L/usr/lib
-LIBS	+= -lsocket -lnsl -lstdc++ -lgen -lthread
-PIC	= -fpic
-AR	= ar
-ARFLAGS	= ruv
-RANLIB	= /bin/true
+CC		= gcc -w
+CXX		= gcc -I. -D__ACE_INLINE__      # -w -fno-strict-prototypes
+DLD		= $(CXX)
+LD		= $(CXX)
+LDFLAGS		+= -L$(WRAPPER_ROOT)/ace -L./ -L/usr/lib
+LIBS		+= -lsocket -lnsl -lstdc++ -lgen -lthread
+PIC		= -fpic
+AR		= ar
+ARFLAGS		= ruv
+RANLIB		= /bin/true
 #SOFLAGS	= -assert pure-text 
-SOFLAGS = -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+SOFLAGS 	= -shared
+SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 # SOLINK	= $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB	= (echo "int main() { return 0; }" > gcctemp.c && \
-	  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
-	  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
-	  status=$$?; rm -f gcctemp*; exit $$status)
+PRELIB		= (echo "int main() { return 0; }" > gcctemp.c && \
+		  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
+		  $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+		  status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index fdd38574bdd..7255cbfbf71 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -1,7 +1,7 @@
 # VxWorks 5.2 with GNU g++ 2.7.2
 # *not* using Orbix
 
-TOOL_DIR	= /appl/wind
+TOOL_DIR	= /opt/wind
 TARGET_DIR	= $(TOOL_DIR)/target
 HOST_DIR	= $(TOOL_DIR)/host/sun4-solaris2
 BIN_DIR		= $(HOST_DIR)/bin
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index c52565f25d9..6b555dc5201 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -4,8 +4,8 @@ CC		= cxvxppc
 #### CXX		= cxvxppc -I. -D__INLINE__
 CXX		= cxvxppc -I.
 CCFLAGS		+= --no_rtti
-DLD		= $(CXX) 
 INCLDIRS	+= -I$(WRAPPER_ROOT) -I.
+DLD		= $(CXX) 
 LD		= $(CXX)
 LDFLAGS		+= -L$(WRAPPER_ROOT)/ace -L./
 PIC		=
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 0e9e8456d88..0f2934d6921 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -21,6 +21,7 @@
 #	DCCFLAGS	C++ compilation flags for debugging
 #	DEFFLAGS	C++ preprocessor flag for defining symbols 
 #	DLD		Name of dynamic linker
+#	LD		Name of linker
 #	IDL		Name of the CORBA IDL compiler
 #	INSBIN		Binary (executable) installation directory
 #	INSINC		Include file installation directory
@@ -111,6 +112,6 @@ endif # debug
 
 COMPILE.c	=$(CC) $(CFLAGS) $(CPPFLAGS)  -c
 COMPILE.cc	=$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)  -c
-LINK.c		=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBS)
-LINK.cc		=$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) 
+LINK.c		=$(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBS)
+LINK.cc		=$(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) $(LDFLAGS) $(LDLIBS) $(LIBS)
 SOLINK.cc	=$(LINK_COMMAND) $(DLD) $(SOFLAGS)