[mq] working branch - merge c4157ff on top of main at 2051155

{"baseBranch":"main","baseCommit":"205115500d87f151abc6f64e940a3f8f2d19e724","createdAt":"2024-12-18T13:24:51.979636Z","headSha":"c4157ff41ba90d48e6bb93aef1ff4b16176b10fe","id":"fd506df6-51af-4206-adb7-42c07964205c","priority":"200","pullRequestNumber":"32340","queuedAt":"2024-12-18T14:22:53.011703Z","status":"STATUS_QUEUED"}
DataDog · Dec 18, 2024 · 8940a3c · 8940a3c
2 parents 0ae9d55 + c4157ff
commit 8940a3c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/omnibus/config/software/python3.rb b/omnibus/config/software/python3.rb
@@ -54,11 +54,11 @@
 
     # Don't forward CC and CXX to python extensions Makefile, it's quite unlikely that any non default
     # compiler we use would end up being available in the system/docker image used by customers
-    if linux_target? && ENV["CC"]
+    if linux_target? && env["CC"]
       command "sed -i \"s/^CC=[[:space:]]*${CC}/CC=gcc/\" #{install_dir}/embedded/lib/python#{major}.#{minor}/config-3.12-*-linux-gnu/Makefile", :env => env
       command "sed -i \"s/${CC}/gcc/g\" #{install_dir}/embedded/lib/python#{major}.#{minor}/_sysconfigdata__linux_*-linux-gnu.py", :env => env
     end
-    if linux_target? && ENV["CXX"]
+    if linux_target? && env["CXX"]
       command "sed -i \"s/^CXX=[[:space:]]*${CXX}/CC=g++/\" #{install_dir}/embedded/lib/python#{major}.#{minor}/config-3.12-*-linux-gnu/Makefile", :env => env
       command "sed -i \"s/${CXX}/g++/g\" #{install_dir}/embedded/lib/python#{major}.#{minor}/_sysconfigdata__linux_*-linux-gnu.py", :env => env
     end