Merge

2004/07/25 12:11:11+02:00 uni-frankfurt.de!mickey
link opie programs with gcc, not with g++

BKrev: 4103878fDVkXVg40hzmJ1tzt9Dgfeg

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
index 0827793..4b05688 100644 (file)
--- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
+++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
@@ -39,8 +39,8 @@ QMAKE_LIBDIR_QT               = $(OE_QMAKE_LIBDIR_QT)
 QMAKE_INCDIR_OPENGL    =
 QMAKE_LIBDIR_OPENGL    =
 
-QMAKE_LINK             = $(CXX)
-QMAKE_LINK_SHLIB       = $(CXX)
+QMAKE_LINK             = $(CCLD)
+QMAKE_LINK_SHLIB       = $(CCLD)
 QMAKE_LFLAGS           = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE   =
 QMAKE_LFLAGS_DEBUG     =