diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-03-10 01:36:21 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-03-11 03:20:38 +0000 |
| commit | 58c3bba0c5bfb26f464b59263482c6333d2a9f8d (patch) | |
| tree | 9915c382372afe16272345eb803c6808f79df32d /share | |
| parent | cdc439efee5023c94ee1b5b5488011816b0f0f99 (diff) | |
Handle DYLD_ROOT_PATH better. It's only really useful on iOS Simulator.
Most importantly, it can cause problems when used on OS X.
Change-Id: I61f76cb094e4f254a7b9eb2c3a651ac14c92c902
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index c5e7eca9e..36801047f 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -39,9 +39,6 @@ UnixGCC { setupRunEnvironment: { var env = qbs.commonRunEnvironment; - env["DYLD_ROOT_PATH"] = sysroot; - var env; - for (var i in env) { var v = new ModUtils.EnvironmentVariable(i, qbs.pathListSeparator); v.value = env[i]; diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 34818a08d..149935ec1 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -101,7 +101,7 @@ Module { FileInfo.joinPaths(installRoot, installPrefix) ].join(pathListSeparator); - if (sysroot) { + if (targetOS.contains("ios-simulator") && sysroot) { env["DYLD_ROOT_PATH"] = [sysroot]; } } |