From 6c102bd456d760fbe237fd49ce46f212614f228a Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 28 Mar 2004 14:15:47 +0000 Subject: we need to use -rpath, not -rpath-link on x86 or else the inputmethods don't find their stuff (e.g. libpickboard.so) in /plugins/inputmethods/ --- (limited to 'mkspecs') diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index bccb196..add69b3 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf @@ -41,8 +41,8 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ +QMAKE_LINK = gcc +QMAKE_LINK_SHLIB = gcc QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -50,7 +50,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath-link, +QMAKE_RPATH = -Wl,-rpath, QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl -- cgit v0.9.0.2