Merge pull request #3921 from arnaldo2792/fixed-ssm-agent

Adjust SSM agent flags
bottlerocket-os · Apr 26, 2024 · bd11738 · bd11738
2 parents 5f1d42b + 30aeecd
commit bd11738
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/amazon-ssm-agent/amazon-ssm-agent.spec b/packages/amazon-ssm-agent/amazon-ssm-agent.spec
@@ -25,14 +25,15 @@ BuildRequires: %{_cross_os}glibc-devel
 %setup -n %{gorepo}-%{version}
 
 %build
-%set_cross_go_flags
+%set_cross_go_flags_static
 
-# Set CGO_ENABLED=0 to statically link binaries that will be bind-mounted by the ECS agent
-CGO_ENABLED=0 go build ${GOFLAGS} -installsuffix cgo -a -ldflags "-s" -o amazon-ssm-agent \
+go build -ldflags "${GOLDFLAGS}" -o amazon-ssm-agent \
   ./core/agent.go ./core/agent_unix.go ./core/agent_parser.go
-CGO_ENABLED=0 go build ${GOFLAGS} -installsuffix cgo -a -ldflags "-s" -o ssm-agent-worker \
+
+go build -ldflags "${GOLDFLAGS}" -o ssm-agent-worker \
   ./agent/agent.go ./agent/agent_unix.go ./agent/agent_parser.go
-CGO_ENABLED=0 go build ${GOFLAGS} -installsuffix cgo -a -ldflags "-s" -o ssm-session-worker \
+
+go build -ldflags "${GOLDFLAGS}" -o ssm-session-worker \
   ./agent/framework/processor/executer/outofproc/sessionworker/main.go
 
 %install