summaryrefslogtreecommitdiff
path: root/qmake
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-07-25 10:12:31 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-07-25 10:12:31 +0000
commit12beb9ed1ac4c26b6816e26ea029428e945f053a (patch)
tree8a35653f061880fc6599542abac01cf967ad3849 /qmake
parentd94c52489fffcbe941a50d938ba252f5c05c4733 (diff)
Merge
2004/07/25 12:11:11+02:00 uni-frankfurt.de!mickey link opie programs with gcc, not with g++ BKrev: 4103878fDVkXVg40hzmJ1tzt9Dgfeg
Diffstat (limited to 'qmake')
-rw-r--r--qmake/qmake-native-3.2.3/linux-oe-qmake.conf4
1 files changed, 2 insertions, 2 deletions
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 =