File tree Expand file tree Collapse file tree 3 files changed +2
-23
lines changed Expand file tree Collapse file tree 3 files changed +2
-23
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -8,13 +8,11 @@ fn main() -> Result<(), Box<dyn Error>> {
8
8
println ! ( "cargo:rerun-if-changed=build.rs" ) ;
9
9
println ! ( "cargo:rerun-if-env-changed=CARGO_CFG_TARGET_OS" ) ;
10
10
println ! ( "cargo:rerun-if-env-changed=CARGO_CFG_TARGET_ARCH" ) ;
11
- // While OUT_DIR is set for both build.rs and compiling the crate, PROFILE is only set in
12
- // build.rs. So, export it to crate compilation as well.
13
- let profile = env:: var ( "PROFILE" ) . unwrap ( ) ;
14
- println ! ( "cargo:rustc-env=PROFILE={profile}" ) ;
11
+
15
12
if target_os != "android" && target_arch != "wasm32" {
16
13
return Ok ( ( ) ) ;
17
14
}
15
+ let profile = env:: var ( "PROFILE" ) . unwrap ( ) ;
18
16
let mut dir = PathBuf :: from ( env:: var_os ( "OUT_DIR" ) . unwrap ( ) ) ;
19
17
// Strip `$profile/build/*/out`.
20
18
let ok = dir. ends_with ( "out" )
Original file line number Diff line number Diff line change @@ -236,17 +236,6 @@ pub fn main(
236
236
237
237
#[ cfg( not( any( target_os = "android" , target_arch = "wasm32" ) ) ) ]
238
238
{
239
- // Hack: spirv_builder builds into a custom directory if running under cargo, to not
240
- // deadlock, and the default target directory if not. However, packages like `proc-macro2`
241
- // have different configurations when being built here vs. when building
242
- // rustc_codegen_spirv normally, so we *want* to build into a separate target directory, to
243
- // not have to rebuild half the crate graph every time we run. So, pretend we're running
244
- // under cargo by setting these environment variables.
245
- unsafe {
246
- std:: env:: set_var ( "OUT_DIR" , env ! ( "OUT_DIR" ) ) ;
247
- std:: env:: set_var ( "PROFILE" , env ! ( "PROFILE" ) ) ;
248
- }
249
-
250
239
if options. shader == RustGPUShader :: Compute {
251
240
return compute:: start ( & options) ;
252
241
}
You can’t perform that action at this time.
0 commit comments