From a078f323af53a76f8101d3fc93ac9668e3139aed Mon Sep 17 00:00:00 2001 From: Michael Maslanka Date: Thu, 12 Aug 2021 16:54:31 -0500 Subject: [PATCH] Fix pathing for go on windows Signed-off-by: Michael Maslanka Fix condition logic Signed-off-by: Michael Maslanka Fix if condition Signed-off-by: Michael Maslanka --- lib/omnibus/builder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb index 70d7bed1e..14a1c97af 100644 --- a/lib/omnibus/builder.rb +++ b/lib/omnibus/builder.rb @@ -314,11 +314,11 @@ def compiler_safe_path(*pieces) # def go(command, options = {}) build_commands << BuildCommand.new("go `#{command}'") do - bin = embedded_bin("go") + bin = windows? ? windows_safe_path("#{install_dir}/embedded/go/bin/go") : embedded_bin("go") # Check if we are building a go binary and then check if we are on # Red Hat or CentOS so we build the binary properly with a build-id - if command.start_with?("build", " build") && (rhel? || centos?) + if command.start_with?("build", " build") && rhel? command << " -ldflags=-linkmode=external" end