diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-08-12 15:34:23 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-27 15:08:25 +0000 |
| commit | 9c3d12d40b6cdb8ef0f560406db3158f9a18a738 (patch) | |
| tree | a1868d8b507c4f199030acd0799eff7b09c03710 /src/core | |
| parent | aeadc50e2c2efdde82e246a82f0b7983d1801805 (diff) | |
Pass supported -fstack-protector flag to GYP config
Before Xcode 6.3, the shipped compiler din not support the
-fstack-protector-strong flag. Inform GYP to use
the -fstack-protector flag instead.
Change-Id: I91f1e9db5e489b6190423c3d010effd3d86ed9ba
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/mac_osx.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 55601ded9..be037cbde 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -32,5 +32,10 @@ GYP_CONFIG += \ # disable the API usage if the SDK version is lower. !isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1 +# Pass a supported -fstack-protect flag depending on Xcode version. +lessThan(QMAKE_XCODE_VERSION, 6.3) { + GYP_CONFIG += use_xcode_stack_protector_strong=0 +} + QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)" exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\" |