libcxxabi: use cmake as native build input #41900

matthewbauer · 2018-06-12T20:02:32Z

Splicing is broken here in libcxxabi:

error: while evaluating the attribute 'depsBuildTarget' of the derivation 'aarch64-apple-ios-ghc-8.2.2' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'llvm-3.9.1' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'libc++abi-3.9.1-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'cmake-3.11.2-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'libuv-1.20.2-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'installPhase' of the derivation 'apple-framework-ApplicationServices-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'MacOS_SDK-10.10-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'C_INCLUDE_PATH' of the derivation 'python-2.7.15-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'C_INCLUDE_PATH' at /Users/mbauer/nixpkgs/reunification/pkgs/development/interpreters/python/cpython/2.7/default.nix:163:5:
while evaluating 'makeSearchPathOutput' at /Users/mbauer/nixpkgs/reunification/lib/strings.nix:94:42, called from /Users/mbauer/nixpkgs/reunification/pkgs/development/interpreters/python/cpython/2.7/default.nix:163:22:
while evaluating 'makeSearchPath' at /Users/mbauer/nixpkgs/reunification/lib/strings.nix:84:28, called from /Users/mbauer/nixpkgs/reunification/lib/strings.nix:94:48:
while evaluating anonymous function at /Users/mbauer/nixpkgs/reunification/lib/strings.nix:85:32, called from undefined position:
while evaluating the attribute 'buildInputs' of the derivation 'configd-osx-10.8.5-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'installPhase' of the derivation 'IOKit-osx-10.11.6-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
while evaluating the attribute 'buildInputs' of the derivation 'xnu-osx-10.11.6-aarch64-apple-ios' at /Users/mbauer/nixpkgs/reunification/pkgs/stdenv/generic/make-derivation.nix:170:11:
infinite recursion encountered, at undefined position

Need to specify cmake correctly for things to work.

GrahamcOfBorg · 2018-06-12T20:15:22Z

Success on x86_64-darwin (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/bvrz6gfvmgb620knx2d9nr8kvz4l21i7-llvm-5.0.2

GrahamcOfBorg · 2018-06-12T20:15:35Z

Success on x86_64-linux (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/pdxfn617j4frnlbz13jv2y85s2ppgnb1-llvm-5.0.2

GrahamcOfBorg · 2018-06-12T20:15:38Z

Success on aarch64-linux (full log)

Attempted: llvm

Partial log (click to expand)

these paths will be fetched (34.41 MiB download, 219.39 MiB unpacked):
  /nix/store/xsc3rsqxrapyzicp3a19px1skwj3z4qk-llvm-5.0.2-lib
  /nix/store/zvv8vkmb0wp0499hk50n4nx6qb1gmwli-llvm-5.0.2
copying path '/nix/store/xsc3rsqxrapyzicp3a19px1skwj3z4qk-llvm-5.0.2-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/zvv8vkmb0wp0499hk50n4nx6qb1gmwli-llvm-5.0.2' from 'https://cache.nixos.org'...
/nix/store/zvv8vkmb0wp0499hk50n4nx6qb1gmwli-llvm-5.0.2

LnL7 · 2018-06-12T20:28:07Z

pkgs/development/compilers/llvm/3.9/default.nix

@@ -54,7 +55,7 @@ let

    libcxx = callPackage ./libc++ {};

-    libcxxabi = callPackage ./libc++abi.nix {};
+    libcxxabi = callPackage ./libc++abi.nix { cmake = buildPackages.cmake; };


Do we want to do this for all versions?

Actually it wouldn't hurt. I think this is the only place where it's used in cross bootstrapping though.

Yeah I think it should be done anywhere that callPackage is being overriden like this.

/cc @Ericson2314

GrahamcOfBorg · 2018-06-12T20:53:46Z

Success on aarch64-linux (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/zvv8vkmb0wp0499hk50n4nx6qb1gmwli-llvm-5.0.2

GrahamcOfBorg · 2018-06-12T20:54:04Z

Success on x86_64-darwin (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/bvrz6gfvmgb620knx2d9nr8kvz4l21i7-llvm-5.0.2

GrahamcOfBorg · 2018-06-12T20:54:13Z

Success on x86_64-linux (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/pdxfn617j4frnlbz13jv2y85s2ppgnb1-llvm-5.0.2

matthewbauer · 2018-06-12T21:09:04Z

Actually this might be introducing its own issue:

builder for '/nix/store/rhvp99aryldqa1adi14hm09iz9wqpg60-libc++abi-3.9.1-aarch64-apple-ios.drv' failed with exit code 127; last 10 log lines:
  source root is libcxxabi-3.9.1.src
  unpacking source archive /nix/store/0ry8hihgwjdnifnfpkyk8vfdcndvig8m-libcxx-3.9.1.src.tar.xz
  unpacking source archive /nix/store/wbprv4amvhnp8alw8fhx7hpgmnwxa3br-llvm-3.9.1.src.tar.xz
  setting SOURCE_DATE_EPOCH to timestamp 1471277406 of file libcxxabi-3.9.1.src/test/test_demangle.pass.cpp
  patching sources
  updateAutotoolsGnuConfigScriptsPhase
  configuring
  fixing cmake files...
  cmake flags: -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/1r4881l4sga4hjzlhsbwv8s9ay4jaapn-libc++abi-3.9.1-aarch64-apple-ios/include -DCMAKE_INSTALL_LIBDIR=/nix/store/1r4881l4sga4hjzlhsbwv8s9ay4jaapn-libc++abi-3.9.1-aarch64-apple-ios/lib -DCMAKE_INSTALL_NAME_DIR=/nix/store/1r4881l4sga4hjzlhsbwv8s9ay4jaapn-libc++abi-3.9.1-aarch64-apple-ios/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_DEPLOYMENT_TARGET= -DCMAKE_OSX_SYSROOT= -DCMAKE_FIND_FRAMEWORK=last -DCMAKE_STRIP=/nix/store/a1w8w04kr8b1glznwqyf4najcqz61pqa-aarch64-apple-ios-cctools-binutils-darwin/bin/aarch64-apple-ios-strip -DCMAKE_RANLIB=/nix/store/a1w8w04kr8b1glznwqyf4najcqz61pqa-aarch64-apple-ios-cctools-binutils-darwin/bin/aarch64-apple-ios-ranlib -DCMAKE_AR=/nix/store/a1w8w04kr8b1glznwqyf4najcqz61pqa-aarch64-apple-ios-cctools-binutils-darwin/bin/aarch64-apple-ios-ar -DCMAKE_C_COMPILER=aarch64-apple-ios-clang -DCMAKE_CXX_COMPILER=aarch64-apple-ios-clang++ -DCMAKE_INSTALL_PREFIX=/nix/store/1r4881l4sga4hjzlhsbwv8s9ay4jaapn-libc++abi-3.9.1-aarch64-apple-ios -DLLVM_PATH=/private/tmp/nix-build-libc++abi-3.9.1-aarch64-apple-ios.drv-0/llvm-3.9.1.src -DLIBCXXABI_LIBCXX_INCLUDES=/private/tmp/nix-build-libc++abi-3.9.1-aarch64-apple-ios.drv-0/libcxx-3.9.1.src/include 
  /nix/store/z745hk4k2dzbv6dp2ydfpx7s4r6560cj-cmake-3.11.2/nix-support/setup-hook: line 79: cmake: command not found

I can't figure out why cmake can't be found. Is the buildPackages affecting it?

matthewbauer · 2018-06-13T00:29:16Z

Actually I was able to just use nativeBuildInputs for cmake. @Ericson2314 does this look okay to you? I'll let you decide to merge it.

orivej · 2018-06-13T00:35:04Z

pkgs/development/compilers/llvm/3.9/libc++abi.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation {

  src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";

-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;


Please leave libunwind in the buildInputs.

orivej · 2018-06-13T00:40:37Z

If it works now feel free to merge: it looks correct.

matthewbauer · 2018-06-13T00:41:29Z

Ok awesome! It may need to also go in a few other places in LLVM though.

GrahamcOfBorg · 2018-06-13T00:58:53Z

Success on x86_64-linux (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/pdxfn617j4frnlbz13jv2y85s2ppgnb1-llvm-5.0.2

GrahamcOfBorg · 2018-06-13T00:59:45Z

Success on x86_64-darwin (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/bvrz6gfvmgb620knx2d9nr8kvz4l21i7-llvm-5.0.2

GrahamcOfBorg · 2018-06-13T01:00:38Z

Success on aarch64-linux (full log)

Attempted: llvm

Partial log (click to expand)

/nix/store/zvv8vkmb0wp0499hk50n4nx6qb1gmwli-llvm-5.0.2

Ericson2314 · 2018-06-13T19:18:59Z

Yeah this looks great. Lets do it in for all other versions too. (Can do staging-requring ones after cause nice to get stuff to master.)

matthewbauer requested a review from Ericson2314 June 12, 2018 20:02

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jun 12, 2018

LnL7 reviewed Jun 12, 2018

View reviewed changes

matthewbauer force-pushed the fix-darwin-cross branch from 562b466 to f882e2d Compare June 12, 2018 20:32

matthewbauer force-pushed the fix-darwin-cross branch from f882e2d to fd4dbed Compare June 13, 2018 00:28

matthewbauer changed the title ~~llvm: use cmake from buildPackages~~ libcxxabi: use cmake as native build input Jun 13, 2018

orivej reviewed Jun 13, 2018

View reviewed changes

llvm: use native cmake for libc++abi

1cb1b91

matthewbauer force-pushed the fix-darwin-cross branch from fd4dbed to 1cb1b91 Compare June 13, 2018 00:36

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jun 13, 2018

matthewbauer merged commit dbfab81 into NixOS:master Jun 13, 2018

Ericson2314 deleted the fix-darwin-cross branch June 13, 2018 19:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libcxxabi: use cmake as native build input #41900

libcxxabi: use cmake as native build input #41900

matthewbauer commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

LnL7 Jun 12, 2018

matthewbauer Jun 12, 2018

matthewbauer Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

matthewbauer commented Jun 12, 2018

matthewbauer commented Jun 13, 2018

orivej Jun 13, 2018

matthewbauer Jun 13, 2018

orivej commented Jun 13, 2018

matthewbauer commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

Ericson2314 commented Jun 13, 2018

libcxxabi: use cmake as native build input #41900

libcxxabi: use cmake as native build input #41900

Conversation

matthewbauer commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

LnL7 Jun 12, 2018

Choose a reason for hiding this comment

matthewbauer Jun 12, 2018

Choose a reason for hiding this comment

matthewbauer Jun 12, 2018

Choose a reason for hiding this comment

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

GrahamcOfBorg commented Jun 12, 2018

matthewbauer commented Jun 12, 2018

matthewbauer commented Jun 13, 2018

orivej Jun 13, 2018

Choose a reason for hiding this comment

matthewbauer Jun 13, 2018

Choose a reason for hiding this comment

orivej commented Jun 13, 2018

matthewbauer commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

GrahamcOfBorg commented Jun 13, 2018

Ericson2314 commented Jun 13, 2018