From 2739aa98b1da164b398a37e6018c205d59debf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 15 Nov 2021 13:53:20 +0100 Subject: Update architectures in machtest to arm64+x86_64, removing i386 and ppc Change-Id: I2a833e220919374e19e3914b4247246b83bec4ce Reviewed-by: Alexandru Croitor --- .../plugin/qpluginloader/machtest/machtest_fat.pro | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro') diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro index 9c34a873bc..1a667322a7 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro @@ -7,41 +7,40 @@ load(qt) # Generate a fat binary with three architectures fat_all.target = good.fat.all.dylib fat_all.commands = lipo -create -output $@ \ - -arch ppc64 good.ppc64.dylib \ - -arch i386 good.i386.dylib \ + -arch arm64 good.arm64.dylib \ -arch x86_64 good.x86_64.dylib -fat_all.depends += good.i386.dylib good.x86_64.dylib good.ppc64.dylib +fat_all.depends += good.arm64.dylib good.x86_64.dylib -fat_no_i386.target = good.fat.no-i386.dylib -fat_no_i386.commands = lipo -create -output $@ -arch x86_64 good.x86_64.dylib -arch ppc64 good.ppc64.dylib -fat_no_i386.depends += good.x86_64.dylib good.ppc64.dylib +fat_no_arm64.target = good.fat.no-arm64.dylib +fat_no_arm64.commands = lipo -create -output $@ -arch x86_64 good.x86_64.dylib +fat_no_arm64.depends += good.x86_64.dylib 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 +fat_no_x86_64.commands = lipo -create -output $@ -arch arm64 good.arm64.dylib +fat_no_x86_64.depends += good.arm64.dylib -stub_i386.commands = $$QMAKE_CXX -shared -arch i386 -o stub.i386.dylib $$PWD/stub.cpp -stub_i386.depends += $$PWD/stub.cpp +stub_arm64.commands = $$QMAKE_CXX $(CXXFLAGS) -shared -arch arm64 -o stub.arm64.dylib $$PWD/stub.cpp +stub_arm64.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.commands = $$QMAKE_CXX $(CXXFLAGS) -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 i386 stub.i386.dylib -fat_stub_i386.depends += stub_i386 good.x86_64.dylib good.ppc64.dylib +fat_stub_arm64.target = good.fat.stub-arm64.dylib +fat_stub_arm64.commands = lipo -create -output $@ -arch arm64 stub.arm64.dylib +fat_stub_arm64.depends += stub_arm64 good.x86_64.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 x86_64 stub.x86_64.dylib -fat_stub_x86_64.depends += stub_x86_64 good.i386.dylib good.ppc64.dylib +fat_stub_x86_64.commands = lipo -create -output $@ -arch x86_64 stub.x86_64.dylib +fat_stub_x86_64.depends += stub_x86_64 good.arm64.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 stub_i386 stub_x86_64 +MYTARGETS = $$fat_all.depends fat_all fat_no_x86_64 fat_no_arm64 \ + fat_stub_arm64 fat_stub_x86_64 bad stub_arm64 stub_x86_64 all.depends += $$MYTARGETS QMAKE_EXTRA_TARGETS += $$MYTARGETS all -QMAKE_CLEAN += $$fat_all.target $$fat_no_i386.target $$fat_no_x86_64.target \ - $$fat_stub_i386.target $$fat_stub_x86_64.target \ +QMAKE_CLEAN += $$fat_all.target $$fat_no_arm64.target $$fat_no_x86_64.target \ + $$fat_stub_arm64.target $$fat_stub_x86_64.target \ "bad*.dylib" -- cgit v1.2.3 From 295b1111afaa274bd9976ac057fcae1a072f8cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 16 Nov 2021 13:52:07 +0100 Subject: Don't pass CXXFLAGS when creating machtest stubs We need the SDK path, but we don't want the multiple architectures that's in the CXXFLAGS for universal builds. Change-Id: Id0c487fc2e03953099a8289dbef9a684514e1135 Reviewed-by: Alexandru Croitor --- tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro') diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro index 1a667322a7..594c352b44 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro @@ -19,10 +19,12 @@ fat_no_x86_64.target = good.fat.no-x86_64.dylib fat_no_x86_64.commands = lipo -create -output $@ -arch arm64 good.arm64.dylib fat_no_x86_64.depends += good.arm64.dylib -stub_arm64.commands = $$QMAKE_CXX $(CXXFLAGS) -shared -arch arm64 -o stub.arm64.dylib $$PWD/stub.cpp +sdk_flags = -L$$system(xcrun --show-sdk-path)/usr/lib/ + +stub_arm64.commands = $$QMAKE_CXX $$sdk_flags -shared -arch arm64 -o stub.arm64.dylib $$PWD/stub.cpp stub_arm64.depends += $$PWD/stub.cpp -stub_x86_64.commands = $$QMAKE_CXX $(CXXFLAGS) -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp +stub_x86_64.commands = $$QMAKE_CXX $$sdk_flags -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp stub_x86_64.depends += $$PWD/stub.cpp fat_stub_arm64.target = good.fat.stub-arm64.dylib -- cgit v1.2.3 From 0ce248ed3636af6b24d76541c583b4d33a5f7093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 17 Nov 2021 16:21:29 +0100 Subject: Explicitly use libc++ when creating machtest stubs Change-Id: I02f8b9b2742596974501f2a170e27be7a707ebd6 Reviewed-by: Alexandru Croitor --- tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro') diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro index 594c352b44..57c6654984 100644 --- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro +++ b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro @@ -19,12 +19,12 @@ fat_no_x86_64.target = good.fat.no-x86_64.dylib fat_no_x86_64.commands = lipo -create -output $@ -arch arm64 good.arm64.dylib fat_no_x86_64.depends += good.arm64.dylib -sdk_flags = -L$$system(xcrun --show-sdk-path)/usr/lib/ +stub_flags = -L$$system(xcrun --show-sdk-path)/usr/lib/ -stdlib=libc++ -stub_arm64.commands = $$QMAKE_CXX $$sdk_flags -shared -arch arm64 -o stub.arm64.dylib $$PWD/stub.cpp +stub_arm64.commands = $$QMAKE_CXX $$stub_flags -shared -arch arm64 -o stub.arm64.dylib $$PWD/stub.cpp stub_arm64.depends += $$PWD/stub.cpp -stub_x86_64.commands = $$QMAKE_CXX $$sdk_flags -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp +stub_x86_64.commands = $$QMAKE_CXX $$stub_flags -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp stub_x86_64.depends += $$PWD/stub.cpp fat_stub_arm64.target = good.fat.stub-arm64.dylib -- cgit v1.2.3