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

llvm/7/compiler-rt: define CMAKE_*_COMPILER_TARGET unconditionally #56502

Merged
merged 1 commit into from Feb 28, 2019

Conversation

@delroth
Copy link
Contributor

@delroth delroth commented Feb 28, 2019

When building with -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON the compiler-rt
CMake configuration attempts to use CMAKE_*_COMPILER_TARGET variables,
which are usually only defined in cross-compilation mode.

Motivation for this change

Fixes regression from #55750.

@matthewbauer

Things done
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

When building with -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON the compiler-rt
CMake configuration attempts to use CMAKE_*_COMPILER_TARGET variables,
which are usually only defined in cross-compilation mode.
@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Feb 28, 2019

Oh weird! I guess because we switched it from configureFlags -> cmakeFlags, it started actually applying COMPILER_RT_DEFAULT_TARGET_ONLY. Seems ok though...

@matthewbauer matthewbauer merged commit fa5ab50 into NixOS:master Feb 28, 2019
10 checks passed
10 checks passed
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Feb 28, 2019

Thanks!

@dtzWill
Copy link
Contributor

@dtzWill dtzWill commented Feb 28, 2019

I'm not sure but should this be stdenv.targetPlatform.config? For non-cross it'll be the same, so getting this right may be important for cross-compilation. It's quite possible this is the correct value, but may be good to check...

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Feb 28, 2019

Yeah, compiler-rt is a runtime library so it should be hostPlatform. We want it to be taken from targetPackages like the libc is.

@dtzWill
Copy link
Contributor

@dtzWill dtzWill commented Feb 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.