aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/imports/qbs/DarwinTools
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-01-28 19:18:53 -0800
committerJake Petroules <jake.petroules@petroules.com>2015-01-29 16:51:00 +0000
commitdb80a65f5496d402cb56455fa6ca469e833f406e (patch)
tree0ae707d77f92d43b28fc5138910dd9d9367e63bf /share/qbs/imports/qbs/DarwinTools
parent48a425b103ad205f50c29481a10230f4537d8da2 (diff)
Set cpp run environment variables when running autotests.
Additionally, allow users to augment or override the environment for any given autotest runner target. Change-Id: Ifea5dd943c688e7339abf3f989b7d5744d938f73 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share/qbs/imports/qbs/DarwinTools')
-rw-r--r--share/qbs/imports/qbs/DarwinTools/darwin-tools.js26
1 files changed, 0 insertions, 26 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
index 6bbd7ff0d..3712d1814 100644
--- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
@@ -1,31 +1,5 @@
var FileInfo = loadExtension("qbs.FileInfo");
-function standardDyldEnvironment(config) {
- var installRoot = config.moduleProperty("qbs", "installRoot");
- var installPrefix = config.moduleProperty("qbs", "installPrefix");
- var pathListSeparator = config.moduleProperty("qbs", "pathListSeparator");
- var sysroot = config.moduleProperty("qbs", "sysroot");
-
- var env = {
- "DYLD_FRAMEWORK_PATH": [
- FileInfo.joinPaths(installRoot, installPrefix, "Library", "Frameworks"),
- FileInfo.joinPaths(installRoot, installPrefix, "lib"),
- FileInfo.joinPaths(installRoot, installPrefix)
- ].join(pathListSeparator),
- "DYLD_LIBRARY_PATH": [
- FileInfo.joinPaths(installRoot, installPrefix, "lib"),
- FileInfo.joinPaths(installRoot, installPrefix, "Library", "Frameworks"),
- FileInfo.joinPaths(installRoot, installPrefix)
- ].join(pathListSeparator)
- };
-
- if (sysroot) {
- env["DYLD_ROOT_PATH"] = [sysroot];
- }
-
- return env;
-}
-
/**
* Returns the most appropriate Apple platform name given a targetOS list.
* Possible platform names include macosx, iphoneos, and iphonesimulator.