Fix androidndk "ensure unaffected test" #44308
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dezgeg
reviewed
Aug 1, 2018
| @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { | |||
| outputs = [ "bin" "dev" "out" ]; # small man pages in $bin | |||
|
|
|||
| nativeBuildInputs = | |||
| [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] | |||
| [ gtk-doc pkgconfig autoreconfHook intltool buildPackages.gobjectIntrospection ] | |||
There was a problem hiding this comment.
Yeah that wasn't needed after all.
matthewbauer
force-pushed
the
fix-cross-ensureUnaffected-test
branch
from
98ded0f
to
ea58ae3
Compare
dezgeg
reviewed
Aug 1, 2018
|
|
||
| src = fetchurl { | ||
| url = "mirror://savannah/lzip/${name}.tar.gz"; | ||
| sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9"; | ||
| }; | ||
|
|
||
| configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++"; | ||
| configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" | ||
| + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " CXX=${stdenv.cc.targetPrefix}c++"; |
There was a problem hiding this comment.
Is explicit CXX actually needed here?
There was a problem hiding this comment.
Looks like it. I think it makes sense to make it unconditional though.
There was a problem hiding this comment.
If you make it unconditional, there's a risk that someone notices it native-compiles fine and removes it completely. So I would keep it conditional.
There was a problem hiding this comment.
No, that's not something to be expected from a standard native-compiling environment.
matthewbauer
commented
Aug 1, 2018
| "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" | ||
| "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" | ||
| "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" | ||
| "-DLLVM_HOST_TRIPLE=${stdenv.buildPlatform.config}" |
There was a problem hiding this comment.
This is very awkward but what I had to do to get equal hashes for these commmands:
$ nix-instantiate -A buildPackages.buildPackages.androidndk --arg crossSystem '{config = "mips64el-apple-windows-gnu"; libc = "glibc"; }'
$ nix-instantiate -A buildPackages.androidndk --arg crossSystem '{config = "mips64el-apple-windows-gnu"; libc = "glibc"; }'
There was a problem hiding this comment.
llvm is being pulled in through jdk & mesa-noglu.
There was a problem hiding this comment.
Wait no they should all be host. llvm uses the terminology correctly here. We'd just make the last one host not target for sake of the "ensure unaffected" test.
There was a problem hiding this comment.
How do you do that? I definitely don't want ensure unaffected to break LLVM cross.
There was a problem hiding this comment.
LLVM_DEFAULT_TARGET_TRIPLEis just the default. It would be the host forensureUnaffected's sake.LLVM_TARGETS_TO_BUILDwe keep unset to build them allTARGET_TRIPLEI don't even know whether it exists, or why we used it. @dtzWill can we remove it? `
dezgeg
reviewed
Aug 1, 2018
| @@ -22,6 +23,5 @@ stdenv.mkDerivation rec { | |||
| homepage = http://www.nongnu.org/lzip/lzip.html; | |||
| description = "A lossless data compressor based on the LZMA algorithm"; | |||
| license = stdenv.lib.licenses.gpl3Plus; | |||
| platforms = stdenv.lib.platforms.unix; | |||
There was a problem hiding this comment.
platforms.all, otherwise Hydra stops building it.
matthewbauer
force-pushed
the
fix-cross-ensureUnaffected-test
branch
from
ea58ae3
to
761d5ce
Compare
|
Failure on x86_64-darwin (full log) Attempted: libgcrypt, libtasn1, llvm, lzip The following builds were skipped because they don't evaluate on x86_64-darwin: libapparmor Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: libgcrypt, libtasn1, llvm, lzip, polkit The following builds were skipped because they don't evaluate on x86_64-darwin: libapparmor Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip, polkit Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: libgcrypt, libtasn1, llvm, lzip The following builds were skipped because they don't evaluate on x86_64-darwin: libapparmor Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip, polkit Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: libapparmor, libgcrypt, libtasn1, llvm, lzip Partial log (click to expand)
|
matthewbauer
force-pushed
the
fix-cross-ensureUnaffected-test
branch
from
761d5ce
to
de2dfff
Compare
Ericson2314
approved these changes
Aug 2, 2018
|
Rebased to avoid conflicting with #44367. |
|
Failure on x86_64-linux (full log) Attempted: libtasn1, llvm, lzip Partial log (click to expand)
|
llvm is a library so it should just need to know about build & host. GCC will already have a cross compiler built. /cc @Ericson2314 @dtzWill
matthewbauer
force-pushed
the
fix-cross-ensureUnaffected-test
branch
from
de2dfff
to
1461b90
Compare
|
Success on aarch64-linux (full log) Attempted: libtasn1, llvm, lzip Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: llvm Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: llvm Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: llvm Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: libtasn1, llvm, lzip Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)