Merge pull request #18197 from nalind/workaround-go-libgcc

Work around a linking problem on 32-bit arches
Upstream-commit: 2ea48e9fc09ba83785355c5d073e9bfae81ea266
Component: engine
This commit is contained in:
Phil Estes
2015-12-10 11:50:03 -05:00
5 changed files with 20 additions and 4 deletions
@@ -1,4 +1,4 @@
// +build linux,!arm
// +build linux
// Package journald provides the log driver for forwarding server logs
// to endpoints that receive the systemd format.
@@ -1,4 +1,4 @@
// +build !linux linux,arm
// +build !linux
package journald
@@ -1,4 +1,4 @@
// +build linux,cgo,!static_build,journald,!arm
// +build linux,cgo,!static_build,journald
package journald
@@ -1,4 +1,4 @@
// +build !linux !cgo static_build !journald linux,arm
// +build !linux !cgo static_build !journald
package journald