diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-20 19:04:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-07-22 02:48:16 +0000 |
| commit | 92ebc4304f1ba53b8f033665b56f9670c5f8598b (patch) | |
| tree | 11f40fcbb42043fb788a9611d080e53a910a9dc1 /tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro | |
| parent | 7218665699e31ac8eebab17afd684d1a56d12ac3 (diff) | |
| download | qtbase-92ebc4304f1ba53b8f033665b56f9670c5f8598b.tar.gz | |
tst_QPluginLoader: Fix MachO stub tests
The -arch_blank argument to lipo is no longer supported.
Change-Id: I47efcb3633f23b7a18d66211bc16d5c9dbc067c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 15a5d1996fff52e50bb2d0f768f459990b266531)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro')
| -rw-r--r-- | tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro index 8daa343e2b..9c34a873bc 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro @@ -20,19 +20,25 @@ fat_no_x86_64.target = good.fat.no-x86_64.dylib fat_no_x86_64.commands = lipo -create -output $@ -arch i386 good.i386.dylib -arch ppc64 good.ppc64.dylib fat_no_x86_64.depends += good.i386.dylib good.ppc64.dylib +stub_i386.commands = $$QMAKE_CXX -shared -arch i386 -o stub.i386.dylib $$PWD/stub.cpp +stub_i386.depends += $$PWD/stub.cpp + +stub_x86_64.commands = $$QMAKE_CXX -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp +stub_x86_64.depends += $$PWD/stub.cpp + fat_stub_i386.target = good.fat.stub-i386.dylib -fat_stub_i386.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch_blank i386 -fat_stub_i386.depends += good.x86_64.dylib good.ppc64.dylib +fat_stub_i386.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch i386 stub.i386.dylib +fat_stub_i386.depends += stub_i386 good.x86_64.dylib good.ppc64.dylib fat_stub_x86_64.target = good.fat.stub-x86_64.dylib -fat_stub_x86_64.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch_blank x86_64 -fat_stub_x86_64.depends += good.i386.dylib good.ppc64.dylib +fat_stub_x86_64.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch x86_64 stub.x86_64.dylib +fat_stub_x86_64.depends += stub_x86_64 good.i386.dylib good.ppc64.dylib bad.commands = $$PWD/generate-bad.pl bad.depends += $$PWD/generate-bad.pl MYTARGETS = $$fat_all.depends fat_all fat_no_x86_64 fat_no_i386 \ - fat_stub_i386 fat_stub_x86_64 bad + fat_stub_i386 fat_stub_x86_64 bad stub_i386 stub_x86_64 all.depends += $$MYTARGETS QMAKE_EXTRA_TARGETS += $$MYTARGETS all |