From 7d8c7b26c811748fc606085bf169dcd8a426eaf4 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 22 Jun 2017 14:23:54 +0000 Subject: [PATCH] runtime: build testprogcgo with -pthread Building this test with gccgo requires an explicit -pthread option to be passed to the C compiler, so that it links against -lpthread. This test is not built today, but it will be soon with a future patch. Reviewed-on: https://go-review.googlesource.com/46451 From-SVN: r249555 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/runtime/testdata/testprogcgo/callback.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 17df499a095..d9839390c5b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f70ef19badafb85b1caa72b51b0082deb48d433a +bbc4f30a027ee09475d08aa4aeed1f2f7067e2e9 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/testdata/testprogcgo/callback.go b/libgo/go/runtime/testdata/testprogcgo/callback.go index 7d9d68ddd11..7b58f4a207e 100644 --- a/libgo/go/runtime/testdata/testprogcgo/callback.go +++ b/libgo/go/runtime/testdata/testprogcgo/callback.go @@ -7,6 +7,9 @@ package main /* +#cgo CFLAGS: -pthread +#cgo LDFLAGS: -pthread + #include void go_callback(); -- 2.30.2