diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-06-12 15:07:30 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-06-12 15:34:55 +0200 |
| commit | 99e489c191557e319d923e0a5ea7276e85742550 (patch) | |
| tree | e748f0a9e610e543456413a43f9d9bb4430425c9 | |
| parent | cf6ac7ea81906a9640b5b9ef2281c3dc4d2b69fd (diff) | |
fix openpty static link problem
- as the linker only adds symbols which are needed,
the order of the libraries are important
Change-Id: Iad8e5a5015cc5949be9b8f0b01702a7f854f6d95
Reviewed-by: Rainer Keller <rainer.keller@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| -rw-r--r-- | installerfw.pri | 2 | ||||
| -rw-r--r-- | src/sdk/sdk.pro | 1 | ||||
| -rw-r--r-- | tools/archivegen/archivegen.pro | 1 | ||||
| -rw-r--r-- | tools/binarycreator/binarycreator.pro | 1 | ||||
| -rw-r--r-- | tools/repogen/repogen.pro | 1 |
5 files changed, 2 insertions, 4 deletions
diff --git a/installerfw.pri b/installerfw.pri index 2d1915ec6..86618d6d3 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -46,6 +46,8 @@ win32:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/win/CPP unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/unix/CPP LIBS += -L$$IFW_LIB_PATH +# The order is important. The linker needs to parse archives in reversed dependency order. +equals(TEMPLATE, app):LIBS += -linstaller unix:!macx:LIBS += -lutil macx:LIBS += -framework Carbon -framework Security diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 7ca88ef93..3cf5b6c64 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -5,7 +5,6 @@ TARGET = installerbase include(../../installerfw.pri) -LIBS += -linstaller QT += network script CONFIG -= app_bundle diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index ff9fdbd59..886a9856e 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -7,7 +7,6 @@ include(../../installerfw.pri) QT -= gui QT += script -LIBS += -linstaller CONFIG += console CONFIG -= app_bundle diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 706318ebc..2e36e1575 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -7,7 +7,6 @@ include(../../installerfw.pri) QT -= gui QT += script -LIBS += -linstaller CONFIG += console CONFIG -= app_bundle diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index 5b6f0d03a..e4df1f56b 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -7,7 +7,6 @@ include(../../installerfw.pri) QT -= gui QT += script -LIBS += -linstaller CONFIG += console CONFIG -= app_bundle |