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

gcc12: disable libsanitizer for mips64 #238716

Merged
2 commits merged into from Aug 24, 2023
Merged

gcc12: disable libsanitizer for mips64 #238716

2 commits merged into from Aug 24, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 20, 2023

Resubmitting @trofi's 6cec03027a07162b1fe1d5bfd61c98e98eb5c316 from #237815 which was the right solution to this problem.

Cc: @trofi @alyssais

Things done
  • Built on platform(s)
    • mips64el-linux (cross from x86_64-linux)
    • mips64-linux (cross from x86_64-linux)
  • Fits CONTRIBUTING.md.

@ghost ghost changed the title ###### Description of changes gcc12: disable libsanitizer for mips64 Jun 20, 2023
@ghost ghost marked this pull request as ready for review June 20, 2023 08:24
@ghost ghost requested a review from matthewbauer as a code owner June 20, 2023 08:24
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM either way.

pkgs/development/compilers/gcc/12/default.nix Outdated Show resolved Hide resolved
@mweinelt mweinelt added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 25, 2023
@ghost
Copy link
Author

ghost commented Aug 23, 2023

Fixed merge conflict.

trofi and others added 2 commits August 23, 2023 14:30
    Without the change build on mips64-unknown-linux-gnu fails as:

        $ nix-build -A buildPackages.gcc12 --argstr crossSystem mips64-linux

        In file included from ...-glibc-mips64-unknown-linux-gnu-2.37-8-dev/include/bits/stat.h:25,
                         from ...-glibc-mips64-unknown-linux-gnu-2.37-8-dev/include/fcntl.h:78,
                         from ../../../../gcc-12.3.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:55:
        ...-glibc-mips64-unknown-linux-gnu-2.37-8-dev/include/bits/struct_stat.h:190:8: error: redefinition of 'struct stat64'
          190 | struct stat64
              |        ^~~~~~
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Aug 23, 2023
@ghost ghost merged commit 87ffdca into NixOS:master Aug 24, 2023
@ghost ghost deleted the pr/gcc12/mips-libsanitizer branch August 24, 2023 04:49
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants