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

Update LLVM default 4 -> 5 #33374

Merged
merged 4 commits into from Feb 11, 2018
Merged

Update LLVM default 4 -> 5 #33374

merged 4 commits into from Feb 11, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 3, 2018

Motivation for this change

Bit overdue, submitting to get this started and to track testing.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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.

Darwin will certainly want to test this, cc @LnL7 @copumpkin

@LnL7
Copy link
Member

LnL7 commented Jan 3, 2018

Not sure why yet, but this causes some infinite recursion on darwin.

@dtzWill
Copy link
Member Author

dtzWill commented Jan 3, 2018

@LnL7 eep, confirmed and just pushed a fix :).

@dtzWill
Copy link
Member Author

dtzWill commented Jan 6, 2018

(updating to target staging instead)

@dtzWill
Copy link
Member Author

dtzWill commented Jan 9, 2018

Ping :).

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Looks like this pulls in a bunch of extra stuff that shouldn't be in the darwin stdenv.

output '/nix/store/30md77sa06dyz4xck99fzfj8v9rwc6i2-stdenv-darwin' is not allowed to refer to the following paths:
	/nix/store/4q1c84f1ynfvsd85a932375sg0jc89v8-bootstrap-tools
	/nix/store/54dlyn7qxp4lpjk55a8fr4s8bcslyqvc-coreutils-8.29
	/nix/store/5jp8k3v9yi342wk1d34d9qqc8qycprh4-sqlite-3.21.0
	/nix/store/9b2kv6px747r7q3x33vd0msbsr747bms-gdbm-1.13
	/nix/store/d5wdi9cjqaq8052qdw4xi1vqk90630mc-python-2.7.14
	/nix/store/gy7qv8z26ig3dbg1g9g970ys01hnbvyq-readline-6.3p08
	/nix/store/m212ikxbnvhiycw54110v2bslclam2gs-gmp-6.1.2
	/nix/store/sa86zrsrn1m4ihm0r4159vxr029w8mh9-bzip2-1.0.6.0.1
	/nix/store/xy0jx6gkv4bjs8xyi52vwn0kn8anx3in-ncurses-5.9

@dtzWill
Copy link
Member Author

dtzWill commented Jan 9, 2018

Thanks for giving it a go... bummer about the extra references! Hmm.

Oh I just noticed this: 72d9016

Could that be related/cause?

@vcunat
Copy link
Member

vcunat commented Jan 9, 2018

I don't expect the version used to bootstrap from would be that important to extend closure.

@LnL7
Copy link
Member

LnL7 commented Jan 9, 2018

I'm pretty sure that's unrelated, however I wouldn't be surprised if the bootstrap tools also need some changes in order to work. I'll try to take a look at this soon.

@LnL7 LnL7 self-assigned this Jan 9, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Jan 14, 2018

python is the key:

$ nix why-depends /nix/store/j3r092ykx9ywnjd8x4m2zkiz014zb2fp-llvm-5.0.1 /nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14 --all
/nix/store/j3r092ykx9ywnjd8x4m2zkiz014zb2fp-llvm-5.0.1
╚═══share/opt-viewer/opt-diff.py: …#!/nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14/bin/python2.7..fr…
    share/opt-viewer/opt-stats.py: …#!/nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14/bin/python2.7..fr…
    share/opt-viewer/opt-viewer.py: …#!/nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14/bin/python2.7..fr…
    share/opt-viewer/optrecord.py: …#!/nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14/bin/python2.7..fr…
    => /nix/store/6yb5rvr6rvgvx8ylpchwz808djfw07rb-python-2.7.14

I'll submit a PR fixing this once I finish compiling and testing it :).

@dtzWill
Copy link
Member Author

dtzWill commented Jan 16, 2018

Can someone test if that PR fixes the Darwin bootstrap problem?

Or maybe save our energy and build hours for 6 in a few months? :)

@LnL7
Copy link
Member

LnL7 commented Jan 31, 2018

The python output resolves that issue, next is darwin.ICU that doesn't build.

1 warning generated.
   c++	 ...  japancal.cpp
   c++	 ...  gregoimp.cpp
   c++	 ...  hebrwcal.cpp
   c++	 ...  indiancal.cpp
   c++	 ...  chnsecal.cpp
   c++	 ...  cecal.cpp
   c++	 ...  coptccal.cpp
   c++	 ...  nfsubs.cpp
   c++	 ...  dangical.cpp
   c++	 ...  ethpccal.cpp
   c++	 ...  coleitr.cpp
   c++	 ...  coll.cpp
   c++	 ...  sortkey.cpp
   c++	 ...  bocsu.cpp
   c++	 ...  ucoleitr.cpp
   c++	 ...  ucol.cpp
ucoleitr.cpp:323:28: error: qualified reference to 'UCollationPCE' is a constructor name rather than a type in this context
    return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
                           ^
ucoleitr.cpp:387:28: error: qualified reference to 'UCollationPCE' is a constructor name rather than a type in this context
    return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
                           ^
2 errors generated.
*** Failed compilation command follows: ----------------------------------------------------------
c++ -DU_ATTRIBUTE_DEPRECATED= -DU_I18N_IMPLEMENTATION -DSTD_INSPIRED -DMAC_OS_X_VERSION_MIN_REQUIRED=1070 -DU_HAVE_ATOMIC=1 -DU_DISABLE_RENAMING=1 -I. -I../common -DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR="/usr/share/icu/" -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-common -c -dynamic -MMD -MT ucoleitr.d ucoleitr.o ucoleitr.ao -o ucoleitr.o ucoleitr.cpp

@LnL7
Copy link
Member

LnL7 commented Feb 1, 2018

@dtzWill dtzWill mentioned this pull request Feb 2, 2018
8 tasks
@dtzWill
Copy link
Member Author

dtzWill commented Feb 2, 2018

The fastjet PR fixes the new failures!

Although it looks like many were aborted so we're not done yet...

@dtzWill dtzWill requested a review from peti as a code owner February 6, 2018 22:40
@LnL7 LnL7 added this to the 18.03 milestone Feb 6, 2018
@peti peti removed their request for review February 7, 2018 07:27
@LnL7 LnL7 merged commit 69779a5 into NixOS:staging Feb 11, 2018
@copumpkin
Copy link
Member

@dtzWill @LnL7 \o/ nice!

@vcunat
Copy link
Member

vcunat commented Feb 13, 2018

qt4 build seems broken on Darwin (noticed accidentally).

@dtzWill
Copy link
Member Author

dtzWill commented Feb 13, 2018

qt4 build seems broken on Darwin (noticed accidentally).

I believe that's due to the same problem clang-5 had with qt5 (update: yep here's the qt5 job, compare the two log tails-- can whatever fixed qt5 be also done for qt4?

@LnL7
Copy link
Member

LnL7 commented Feb 13, 2018

I fixed qt59 and qt510, must have skipped over qt4 accidentally.

@dtzWill dtzWill deleted the update/llvm-5-default branch February 13, 2018 18:17
@vcunat
Copy link
Member

vcunat commented Feb 15, 2018

This is still causing lots of darwin build regressions on staging, most of which is pysqlite killing all haskell. (When testing, beware of the new stdenv-rebuilding commit on staging.)

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

Hmm, I don't think that's related to the clang update. This is a build from my test jobset https://hydra.nixos.org/build/68589517

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

-Lsh: -Lpkg-config: -Lcommand -Lnot -Lfound 😄

@vcunat
Copy link
Member

vcunat commented Feb 15, 2018

The same for includes as well. Perhaps it will be enough to just add pkgconfig to nativeBuildInputs?

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

I'm taking a look at it.

@vcunat
Copy link
Member

vcunat commented Feb 15, 2018

Even with a fix, I wonder whether to just merge the hydra-built commit with the fix commit atop, directly to master... as I'd rather finish this iteration before rebuilding the world again. Alternatives I can see: (2) temporary revert or (3) yet another temporary branch and jobset.

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

I guess that's ok, the amount of rebuilds on master won't be super bad.

@LnL7
Copy link
Member

LnL7 commented Feb 15, 2018

@vcunat Can you join irc?

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

Successfully merging this pull request may close these issues.

None yet

6 participants