Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: fix check-libroach with linux release toolchain #26298

Merged
merged 1 commit into from
May 31, 2018

Conversation

benesch
Copy link
Contributor

@benesch benesch commented May 31, 2018

The Linux release toolchain uses an ancient version of glibc that
requires linking against -lrt. Teach CMake to link test binaries
accordingly on Linux.

The Linux release toolchain also uses a very recent version of libstdc++
that must be statically linked. Plumb the link flags down into CMake via
the LDFLAGS variable. (Previously they were only passed down to links
invoked by Go via the -extldflags flag in the LINKFLAGS variable.)

Release note: None

The Linux release toolchain uses an ancient version of glibc that
requires linking against -lrt. Teach CMake to link test binaries
accordingly on Linux.

The Linux release toolchain also uses a very recent version of libstdc++
that must be statically linked. Plumb the link flags down into CMake via
the LDFLAGS variable. (Previously they were only passed down to links
invoked by Go via the -extldflags flag in the LINKFLAGS variable.)

Release note: None
@benesch benesch requested review from mberhault and a team May 31, 2018 20:22
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mberhault
Copy link
Contributor

LGTM. Thanks for that.

@benesch
Copy link
Contributor Author

benesch commented May 31, 2018

Thanks for the quick review!

bors r=mberhault

craig bot pushed a commit that referenced this pull request May 31, 2018
26239: CONTRIBUTING.md: avoid recommendation to use 'go get' r=couchand a=benesch

Since #25325 landed, 'go get' no longer works. Adjust our contributing
guidelines appropriately.

Release note: None

/cc @rendaw (thanks for the report!)

26290: sql, opt: Add pg error codes, tests for error messages r=rytaft a=rytaft

This commit ensures that all errors in the optbuilder have a pg
errorcode. In order to keep the optimizer in sync with the heuristic
planner, this commit also updates some of the heuristic planner error
messages to match the Postgres error messages and include pgcodes.

Other errors in the optbuilder which should never be thrown (e.g., in
the default case of a switch statement that covers all cases) have been
converted into panics.

Release note (sql change): Fixed some error messages to more closely
match the Postgres error messages, including the corresponding Postgres
error codes.

26296: importccl: re-enable TestImportCSVStmt r=mjibson a=mjibson

The underlying bug appears to have been fixed in #26259.

Release note: None

26298: Makefile: fix check-libroach with linux release toolchain r=mberhault a=benesch

The Linux release toolchain uses an ancient version of glibc that
requires linking against -lrt. Teach CMake to link test binaries
accordingly on Linux.

The Linux release toolchain also uses a very recent version of libstdc++
that must be statically linked. Plumb the link flags down into CMake via
the LDFLAGS variable. (Previously they were only passed down to links
invoked by Go via the -extldflags flag in the LINKFLAGS variable.)

Release note: None

Co-authored-by: Nikhil Benesch <[email protected]>
Co-authored-by: Rebecca Taft <[email protected]>
Co-authored-by: Matt Jibson <[email protected]>
@craig
Copy link
Contributor

craig bot commented May 31, 2018

Build succeeded

@craig craig bot merged commit df4da20 into master May 31, 2018
@benesch benesch deleted the linux-release-libroach branch June 4, 2018 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants