Skip to content

Commit

Permalink
Backed out changeset be9bb9b16fc0 (bug 1698156) for causing hazard fa…
Browse files Browse the repository at this point in the history
…ilures.
  • Loading branch information
CosminSabou committed Mar 25, 2021
1 parent 757f10d commit 8753073
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions gfx/wr/swgl/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@ fn translate_shader(shader_key: &str, shader_dir: &str) {
std::fs::write(&imp_name, imported).unwrap();

let mut build = cc::Build::new();
// Use SWGLPP target to avoid pulling CFLAGS/CXXFLAGS.
if let Ok(tool) = build.try_get_compiler() {
// Force the compiler of the existing target before overriding it.
build.compiler(tool.path());
}
build.target("SWGLPP");
build.no_default_flags(true);
if build.get_compiler().is_like_msvc() {
build.flag("/EP").flag("/clang:-undef");
Expand Down Expand Up @@ -126,12 +120,6 @@ fn main() {

shaders.sort();

// We need to ensure that the C preprocessor does not pull compiler flags from
// the host or target environment. Set up a SWGLPP target with empty flags to
// work around this.
std::env::set_var("CFLAGS_SWGLPP", "");
std::env::set_var("CXXFLAGS_SWGLPP", "");

for shader in &shaders {
translate_shader(shader, &shader_dir);
}
Expand Down

0 comments on commit 8753073

Please sign in to comment.