From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 25 Jul 2004 10:12:31 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~18052
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12beb9ed1ac4c26b6816e26ea029428e945f053a;p=openembedded.git

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 0827793804..4b05688aef 100644
--- 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	=