Modified: trunk/CHANGES (980 => 981)
--- trunk/CHANGES 2011-11-11 18:24:07 UTC (rev 980)
+++ trunk/CHANGES 2011-11-11 22:46:28 UTC (rev 981)
@@ -1,5 +1,8 @@
Darwin Build Scripts Change History
-----------------------------------
+Release 26.3 [11-Nov-2011]
+ - darwintrace: darwintrace_make_environ bug unsets DYLD_INSERT_LIBRARIES
+
Release 26.2 [9-Nov-2011]
- darwintrace: build failure on 10.6, undefined symbol __posix_spawn
- darwintrace: crash in darwintrace_make_environ
Modified: trunk/darwintrace/darwintrace.c (980 => 981)
--- trunk/darwintrace/darwintrace.c 2011-11-11 18:24:07 UTC (rev 980)
+++ trunk/darwintrace/darwintrace.c 2011-11-11 22:46:28 UTC (rev 981)
@@ -409,7 +409,8 @@
if (darwintrace_dylib_path) {
if (libs && strstr(libs, darwintrace_dylib_path)) {
/* inserted libraries already contain dylib */
- result[i] = strdup(DARWINTRACE_PLACEHOLDER);
+ asprintf(&result[i], "%s%s",
+ DYLD_INSERT_LIBRARIES, libs);
} else {
/* otherwise set or insert the dylib path */
asprintf(&result[i], "%s%s%s%s",