Skip to content

Commit

Permalink
cctools: default to llvm90, revbump
Browse files Browse the repository at this point in the history
  • Loading branch information
kencu committed Jan 20, 2020
1 parent bc6bb6d commit 18ee73d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions devel/cctools/Portfile
Expand Up @@ -6,7 +6,7 @@ name cctools
# Xcode 10.0
version 921
set ld64_version 409.12
revision 4
revision 5
categories devel
platforms darwin
maintainers {jeremyhu @jeremyhu} {kencu @kencu} openmaintainer
Expand Down Expand Up @@ -87,7 +87,7 @@ if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
# }

if {![some_llvm_variant_set] && ${os.major} >= 10} {
default_variants +llvm80
default_variants +llvm90
}
}

Expand Down

6 comments on commit 18ee73d

@jmroot
Copy link
Member

@jmroot jmroot commented on 18ee73d Jan 20, 2020

Choose a reason for hiding this comment

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

Why rev bump? Everyone will still have the same variant installed across the upgrade.

@kencu
Copy link
Contributor Author

@kencu kencu commented on 18ee73d Jan 20, 2020

Choose a reason for hiding this comment

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

I wanted the new +llvm90 binary to be built on the buildbot, and installed for new users at least.

How can I force the current users to upgrade their installs automatically to the +llvm90 variant, if there is a way? clang-9.0 produces objects that the libtool in cctools +llvm80 can't handle, and so errors out.

@jmroot
Copy link
Member

@jmroot jmroot commented on 18ee73d Jan 20, 2020

Choose a reason for hiding this comment

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

I wanted the new +llvm90 binary to be built on the buildbot, and installed for new users at least.

Changing the default variant accomplishes both of those things. No need to bump the revision.

How can I force the current users to upgrade their installs automatically to the +llvm90 variant, if there is a way? clang-9.0 produces objects that the libtool in cctools +llvm80 can't handle, and so errors out.

You can't force users to do anything short of removing the other variant.

@kencu
Copy link
Contributor Author

@kencu kencu commented on 18ee73d Jan 20, 2020

Choose a reason for hiding this comment

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

without a revbump, the buildbot would have known to rebuild the same version and revision again, just picking up the new default +llvm90? I had no idea it would be smart enough to see that...

@kencu
Copy link
Contributor Author

@kencu kencu commented on 18ee73d Jan 20, 2020

Choose a reason for hiding this comment

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

but I guess I see it does rebuild ports when +universal is requested ... I will see how this works out.

@ryandesign
Copy link
Contributor

Choose a reason for hiding this comment

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

The buildbot builds anything for which there is not already an archive in the right place. Variant names are part of the archive name, so yes, the buildbot would build it.

Please sign in to comment.