summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/gyp_run.pro')
-rw-r--r--src/core/gyp_run.pro14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 82f18331b..0962c7cfe 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -4,6 +4,18 @@
TEMPLATE = aux
+cross_compile {
+ GYP_ARGS = "-D qt_cross_compile=1"
+ posix: GYP_ARGS += "-D os_posix=1"
+} else {
+ # !cross_compile
+ GYP_ARGS = "-D qt_cross_compile=0"
+ linux: include(config/desktop_linux.pri)
+}
+
+# Append additional platform options defined in GYP_CONFIG
+for (config, GYP_CONFIG): GYP_ARGS += "-D $$config"
+
# Copy this logic from qt_module.prf so that ninja can run according
# to the same rules as the final module linking in core_module.pro.
!host_build:if(win32|mac):!macx-xcode {
@@ -11,9 +23,7 @@ TEMPLATE = aux
contains(QT_CONFIG, build_all):CONFIG += build_all
}
-GYP_ARGS = "-D qt_cross_compile=0"
cross_compile {
- GYP_ARGS = "-D qt_cross_compile=1 -D os_posix=1"
TOOLCHAIN_SYSROOT = $$[QT_SYSROOT]
android {