Just use system-provided compiler

StackVista · Apr 29, 2024 · 35c42a9 · 35c42a9
1 parent 98d46e1
commit 35c42a9
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 9 deletions.
diff --git a/omnibus/config/software/file.rb b/omnibus/config/software/file.rb
@@ -34,8 +34,6 @@
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
-  env["CC"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/gcc"
-
   configure_options = []
   configure(*configure_options, env: env)
 

diff --git a/omnibus/config/software/libselinux.rb b/omnibus/config/software/libselinux.rb
@@ -36,8 +36,6 @@
   patch source: "ln_no_relative.patch", env: env # fix build with old glibc
   patch source: "fcntl_o_path.patch", env: env # don't use relative symlink on installed libraries
 
-  env["CC"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/gcc"
-
   make "-j #{workers} PREFIX=/ DESTDIR=#{install_dir}/embedded", env: env
   make "-j #{workers} install PREFIX=/ DESTDIR=#{install_dir}/embedded", env: env
 

diff --git a/omnibus/config/software/libsepol.rb b/omnibus/config/software/libsepol.rb
@@ -34,8 +34,6 @@
 
   patch source: "ln_no_relative.patch", env: env # don't use relative symlink on installed libraries
 
-  env["CC"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/gcc"
-
   make "-j #{workers} PREFIX=/ DESTDIR=#{install_dir}/embedded", env: env
   make "-j #{workers} install PREFIX=/ DESTDIR=#{install_dir}/embedded", env: env
 

diff --git a/omnibus/config/software/openscap.rb b/omnibus/config/software/openscap.rb
@@ -64,8 +64,6 @@
 
   patch source: "oscap-io.patch", env: env # add new oscap-io tool
 
-  env["CC"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/gcc"
-  env["CXX"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/g++"
   env["CXXFLAGS"] += " -static-libstdc++ -std=c++11 -DDPKG_DATADIR=/usr/share/dpkg"
 
   cmake_build_dir = "#{project_dir}/build"

diff --git a/omnibus/config/software/xmlsec.rb b/omnibus/config/software/xmlsec.rb
@@ -37,7 +37,6 @@
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
-  env["CC"] = "/opt/gcc-#{ENV['GCC_VERSION']}/bin/gcc"
   env["CFLAGS"] << " -fPIC"
   env["CFLAGS"] << " -std=c99"