Convert makefiles to build LLVM/compiler-rt with CMake #34055

brson · 2016-06-03T02:02:34Z

This is certainly buggy, but I have successfully built on x86_64-unknown-linux-gnu and x86_64-pc-windows-gnu. I haven't built successfully on mac yet, and I've seen mysterious test failures on Linux, but I'm interested in throwing this at the bots to see what they think.

rust-highfive · 2016-06-03T02:02:45Z

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

brson · 2016-06-03T02:05:40Z

FWIW re the mac failures: I was trying to build this on rust-mac6 and couldn't get it to recognize C++11 atomics. I'm not sure why this would be but I'm sort of crossing my fingers that clang is out of date there?

alexcrichton · 2016-06-04T00:25:56Z

mk/rt.mk

+
+endif
+endif
+endif


This is totally a readable makefile now!

alexcrichton · 2016-06-04T00:27:42Z

I vaguely remember that OSX failure not being spurious in rustbuild and fixing it through setting MACOSX_DEPLOYMENT_TARGET, but other than that r=me when this is ready.

This will probably bounce quite a few times as we figure out how to actually build compiler-rt for all the cross platforms, I don't think rustbuild is even prepared to do that everywhere (especially Android).

shepmaster · 2016-06-05T20:54:32Z

I tangentially asked this on the Internals forum, but why put the effort into updating the Makefiles instead of charging ahead with rustbuild?

brson · 2016-06-06T21:11:49Z

@shepmaster @alexcrichton says we're not going to be ready to remove the makefiles soon, and I want to have emscripten support soon.

brson · 2016-06-06T21:12:17Z

@alexcrichton why aren't we going to be able to remove the makefiles soon?

brson · 2016-06-06T21:17:53Z

Exporting MACOSX_DEPLOYMENT_TARGET=10.7 didn't help.

brson · 2016-06-06T22:02:25Z

I figured out that the -stdlib=libc++ flag makes #import <atomic> work, but can't see how to make the cmake atomic config check pass that flag. -DLLVM_ENABLE_LIBCXX=ON doesn't do it.

brson · 2016-06-06T22:02:49Z

@alexcrichton does rustbuild definitely work on os x?

brson · 2016-06-06T22:05:18Z

Er, I can run cmake by hand successfully, so I must have the script messed up.

brson · 2016-06-06T22:36:07Z

OK, I think it must have been a corrupted local configuration. Seems to be working now.

shepmaster · 2016-06-06T22:46:39Z

I am definitely building using rustbuild on OS X.

alexcrichton · 2016-06-06T23:01:38Z

Some messages on IRC ---

15:52 <~acrichto> brson: yeah rustbuild osx works (gated)
15:52 <~acrichto> you're right about -stdlib though, that's the flag not 
                  DEPLOYMENT_VERSION
15:52 <~acrichto> and it all comes back...
15:52 <~acrichto> brson: if you mirror the rustbuild cmake exactly it should in 
                  theory work
15:53 <~acrichto> brson: I think it's this -- 
https://github.com/rust-lang/rust/blob/master/src/bootstrap/build/mod.rs#L808
15:53 <~acrichto> you may have already found that...

But yeah I was misremembering MACOSX_DEPLOYMENT_VERSION, it's just -stdlib in CFLAGS somehow

brson · 2016-06-07T00:48:48Z

I've built successfully on OS X and am going to send this through the bots to see what happens.

@bors r+

bors · 2016-06-07T00:48:49Z

📌 Commit aebdccf has been approved by brson

sanxiyn · 2016-06-07T06:13:48Z

It seems that this will break Travis, because Ubuntu package installs LLVMConfig.cmake in a place different from what compiler-rt build system expects. I am trying to figure out how to unbreak.

Convert makefiles to build LLVM/compiler-rt with CMake This is certainly buggy, but I have successfully built on x86_64-unknown-linux-gnu and x86_64-pc-windows-gnu. I haven't built successfully on mac yet, and I've seen mysterious test failures on Linux, but I'm interested in throwing this at the bots to see what they think.

bors · 2016-06-07T07:01:13Z

⌛ Testing commit aebdccf with merge 3c55e21...

bors · 2016-06-07T07:04:52Z

💔 Test failed - auto-mac-cross-ios-opt

alexcrichton · 2016-06-22T02:25:27Z

I think this is finally ready to go. If I could quantify the amount of money it took to test this in dev I'd probably be sad, so I won't do that!

Need to restart buildbot to pick up some changes to the images, then I'll r+

alexcrichton · 2016-06-22T02:26:41Z

guh and of course travis is broken...

alexcrichton · 2016-06-22T02:44:34Z

Ok, some more hacks that were applied:

In the docker image on Travis we now somewhat-randomly symlink some folders to coerce compiler-rt to pick up the system LLVM correctly.
A few patches were applied to compiler-rt to coerce it to compile:
- working on powerpc - rust-lang/compiler-rt@a1ef94b
- working on msvc - rust-lang/compiler-rt@dd79ba2

One glaring hole is that make -j10 does not compile LLVM in parallel right now. I have no idea why and I'm still trying to figure that out...

alexcrichton · 2016-06-22T02:54:52Z

Ok, parallelism should be fixed

alexcrichton · 2016-06-22T03:39:48Z

@bors: r+

bors · 2016-06-22T03:39:49Z

📌 Commit 59db95b has been approved by alexcrichton

bors · 2016-06-22T14:40:11Z

⌛ Testing commit 59db95b with merge b592b3c...

Convert makefiles to build LLVM/compiler-rt with CMake This is certainly buggy, but I have successfully built on x86_64-unknown-linux-gnu and x86_64-pc-windows-gnu. I haven't built successfully on mac yet, and I've seen mysterious test failures on Linux, but I'm interested in throwing this at the bots to see what they think.

bors · 2016-06-22T16:43:42Z

💔 Test failed - auto-mac-64-opt-rustbuild

alexcrichton · 2016-06-22T17:32:56Z

@bors: retry

weird lldb error on OSX?

bors · 2016-06-22T17:32:59Z

alexcrichton · 2016-06-22T17:33:19Z

error may be related to #33391

bors · 2016-06-22T19:14:03Z

💔 Test failed - auto-linux-64-x-android-t

alexcrichton · 2016-06-22T19:25:19Z

@bors: retry

umm... Contention?

On Wednesday, June 22, 2016, bors [email protected] wrote:

💔 Test failed - auto-linux-64-x-android-t
http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/9521

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#34055 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AAD95BrxFR1hs6z_PqTAvF5eDuEJ7ZuBks5qOYmBgaJpZM4ItJAC
.

bors · 2016-06-23T02:28:27Z

⌛ Testing commit 59db95b with merge 930eb8a...

bors · 2016-06-23T04:11:26Z

💔 Test failed - auto-linux-64-x-android-t

alexcrichton · 2016-06-24T03:05:22Z

@bors: retry

Looks like it's stuck compiling stage1 libsyntax but I can't seem to reproduce it locally. Hoping that it's just contention locally...

bors · 2016-06-24T06:33:33Z

⌛ Testing commit 59db95b with merge 8c63d12...

Convert makefiles to build LLVM/compiler-rt with CMake This is certainly buggy, but I have successfully built on x86_64-unknown-linux-gnu and x86_64-pc-windows-gnu. I haven't built successfully on mac yet, and I've seen mysterious test failures on Linux, but I'm interested in throwing this at the bots to see what they think.

bors · 2016-06-24T10:39:46Z

brson · 2016-06-27T16:25:31Z

Wow I'm shocked this got through. Thanks for fixing it @alexcrichton

rust-highfive assigned alexcrichton Jun 3, 2016

brson force-pushed the cmake branch from 453ff0c to 1323179 Compare June 3, 2016 02:04

brson force-pushed the cmake branch 2 times, most recently from 4f7700b to 26cdf06 Compare June 3, 2016 02:09

alexcrichton reviewed Jun 4, 2016
View reviewed changes

mk/rt.mk

endif

endif

endif

Copy link

Member

alexcrichton Jun 4, 2016

Choose a reason for hiding this comment

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

This is totally a readable makefile now!

brson force-pushed the cmake branch from c1b1b85 to 61c792f Compare June 6, 2016 21:31

brson force-pushed the cmake branch from 61c792f to bbcfa53 Compare June 6, 2016 22:36

brson force-pushed the cmake branch 4 times, most recently from 474b1d3 to aebdccf Compare June 7, 2016 00:47

alexcrichton force-pushed the cmake branch from 71be23a to ca66f0a Compare June 22, 2016 02:41

Convert makefiles to build LLVM/compiler-rt with CMake

59db95b

alexcrichton force-pushed the cmake branch from ca66f0a to 59db95b Compare June 22, 2016 02:54

bors merged commit 59db95b into rust-lang:master Jun 24, 2016

petrochenkov mentioned this pull request Jun 26, 2016

./configure fails on Windows/MSYS2 #34489

Closed

This was referenced Jul 2, 2016

XCode 7 complains: building for iOS simulator, but linking in object file built for OSX, for architecture x86_64 TimNN/cargo-lipo#3

Closed

iOS stdlib / universal library regression #34617

Closed

Fix ios / compiler-rt condition in makefile #34627

Closed

Convert makefiles to build LLVM/compiler-rt with CMake #34055

Convert makefiles to build LLVM/compiler-rt with CMake #34055

Conversation

brson commented Jun 3, 2016

rust-highfive commented Jun 3, 2016

brson commented Jun 3, 2016

alexcrichton Jun 4, 2016

Choose a reason for hiding this comment

alexcrichton commented Jun 4, 2016

shepmaster commented Jun 5, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

brson commented Jun 6, 2016

shepmaster commented Jun 6, 2016 via email

alexcrichton commented Jun 6, 2016

brson commented Jun 7, 2016

bors commented Jun 7, 2016

sanxiyn commented Jun 7, 2016

bors commented Jun 7, 2016

bors commented Jun 7, 2016

alexcrichton commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

bors commented Jun 22, 2016

bors commented Jun 22, 2016

bors commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

bors commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

bors commented Jun 22, 2016

alexcrichton commented Jun 22, 2016

bors commented Jun 23, 2016

bors commented Jun 23, 2016

alexcrichton commented Jun 24, 2016

bors commented Jun 24, 2016

bors commented Jun 24, 2016

brson commented Jun 27, 2016