646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
878 B
Diff
21 lines
878 B
Diff
diff --git a/SConstruct b/SConstruct
|
|
index 057ec7628c..760be89fff 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -67,14 +67,7 @@ elif platform_arg == "javascript":
|
|
elif os.name == "nt" and methods.get_cmdline_bool("use_mingw", False):
|
|
custom_tools = ["mingw"]
|
|
|
|
-# We let SCons build its default ENV as it includes OS-specific things which we don't
|
|
-# want to have to pull in manually.
|
|
-# Then we prepend PATH to make it take precedence, while preserving SCons' own entries.
|
|
-env_base = Environment(tools=custom_tools)
|
|
-env_base.PrependENVPath("PATH", os.getenv("PATH"))
|
|
-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
|
|
-if "TERM" in os.environ: # Used for colored output.
|
|
- env_base["ENV"]["TERM"] = os.environ["TERM"]
|
|
+env_base = Environment(ENV = os.environ, tools=custom_tools)
|
|
|
|
env_base.disabled_modules = []
|
|
env_base.use_ptrcall = False
|