diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-23 16:09:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-24 18:00:31 +0200 |
| commit | 98c204a48616d8287ab2bdec2630ab0e4584a61d (patch) | |
| tree | a39d961b5b133e363802e834bdeb961627b65c97 /mkspecs | |
| parent | 6cdd9928ab3de3c84b39b8b2d395f139fbf9aba2 (diff) | |
iOS: Resolve location of crt.o at build time, not qmake time
By referring to crt.o by $(SDK) we allow Xcode to switch between the
iPhoneSimulator and the iPhoneOS SDKs.
Change-Id: I33d9f30b2f5a8f085dc4ddfc6e2ef228d02d639c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ios/qt.prf | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mkspecs/features/ios/qt.prf b/mkspecs/features/ios/qt.prf index f89cb0c287..79bc9a8f46 100644 --- a/mkspecs/features/ios/qt.prf +++ b/mkspecs/features/ios/qt.prf @@ -27,13 +27,9 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { # get rid of this step completely and just pass -e _qtmn to the # linker, taking advantage of the new LC_MAIN load command. - # We use xcodebuild to resolve the location of the crt1 object file - # as we know that it lives in the same location as the c library. - c_library_path = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -find-library c 2>/dev/null") - - # We also know that iOS 3.1 and up uses crt1.3.1.o (technically not + # We know that iOS 3.1 and up uses crt1.3.1.o (technically not # true for simulator, but the SDK has a symlink to the correct file). - original_crt_path = $$dirname(c_library_path)/crt1.3.1.o + original_crt_path = "$(SDK_DIR)/usr/lib/crt1.3.1.o" xcode_objects_path = "$(OBJECT_FILE_DIR_$(CURRENT_VARIANT))/$(CURRENT_ARCH)" custom_crt_filename = "crt1_qt.o" |