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.

Sign up for GitHub

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

Jump to bottom

cc-wrapper, bintools-wrapper: unbreak include/link paths when cross-compiling #41429

Merged
merged 1 commit into from Jun 5, 2018
Merged

cc-wrapper, bintools-wrapper: unbreak include/link paths when cross-compiling #41429

merged 1 commit into from Jun 5, 2018

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

2110c0b refactored cc-wrapper and bintools-wrapper to use pkgs/build-support/setup-hooks/role.bash. There appears to have been a small mistake in how this was done, which caused dependencies to be added NIX_TARGET_CFLAGS/LDFLAGS instead of NIX_CFLAGS/LDFLAGS when cross-compiling.

I discovered this when attempting to cross compile tmon, which failed because it was unable to find its ncurses dependency. With this PR, it successfully compiles.

Things done

Use getHostRoleEnvHook instead of getTargetRoleEnvHook, which looks at $depHostOffset instead of $depTargetOffset.

cc @Ericson2314

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@lopsided98
cc-wrapper, bintools-wrapper: use getHostRoleEnvHook instead of getTa…
645f03b 
…rgetRoleEnvHook

Fixes include and link paths when cross compiling.
@Ericson2314 Ericson2314 changed the base branch from master to staging June 5, 2018 02:42
@Ericson2314
Copy link
Member

Good catch!

@Ericson2314 Ericson2314 merged commit c69c959 into NixOS:staging Jun 5, 2018
@lopsided98 lopsided98 deleted the fix-env-hook branch June 5, 2018 02:43
@Ericson2314
Copy link
Member

CC @matthewbauer cross is very broken on master without this.

@dtzWill dtzWill mentioned this pull request Jun 6, 2018
Merged
@matthewbauer
Copy link
Member

We definitely need some cross stuff in the release build! I thought this was in nixpkgs-unstable but it looks like it's still in staging.

@Ericson2314 Ericson2314 mentioned this pull request Jun 13, 2018
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@orivej orivej Awaiting requested review from orivej

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lopsided98 @Ericson2314 @matthewbauer @GrahamcOfBorg