@@ -142,18 +142,18 @@ impl WorkspaceBuildScripts {
142
142
}
143
143
acc
144
144
} ;
145
- let package_build_data =
146
- outputs[ package] . get_or_insert_with ( Default :: default) ;
147
145
// cargo_metadata crate returns default (empty) path for
148
146
// older cargos, which is not absolute, so work around that.
149
- if !message. out_dir . as_str ( ) . is_empty ( ) {
150
- let out_dir =
151
- AbsPathBuf :: assert ( PathBuf :: from ( message. out_dir . into_os_string ( ) ) ) ;
152
- package_build_data. out_dir = Some ( out_dir) ;
153
- package_build_data. cfgs = cfgs;
147
+ let out_dir = message. out_dir . into_os_string ( ) ;
148
+ if !out_dir. is_empty ( ) {
149
+ let data = outputs[ package] . get_or_insert_with ( Default :: default) ;
150
+ let out_dir = Some ( AbsPathBuf :: assert ( PathBuf :: from ( out_dir) ) ) ;
151
+ ( data. out_dir , data. cfgs ) = ( out_dir, cfgs) ;
152
+ }
153
+ if !message. env . is_empty ( ) {
154
+ outputs[ package] . get_or_insert_with ( Default :: default) . envs =
155
+ message. env ;
154
156
}
155
-
156
- package_build_data. envs = message. env ;
157
157
}
158
158
Message :: CompilerArtifact ( message) => {
159
159
let package = match by_id. get ( & message. package_id . repr ) {
@@ -195,7 +195,7 @@ impl WorkspaceBuildScripts {
195
195
for package in workspace. packages ( ) {
196
196
if let Some ( package_build_data) = & mut outputs[ package] {
197
197
tracing:: info!(
198
- "{} BuildScriptOutput : {:?}" ,
198
+ "{}: {:?}" ,
199
199
workspace[ package] . manifest. parent( ) . display( ) ,
200
200
package_build_data,
201
201
) ;
0 commit comments