Commitc241475

committed

build: link with lld by default on Linux; add Xcode 14.1 to CI matrix

Change-Id: If40a5742748c5bc406663c16e852581eb4413759

1 parent1d48453 commitc241475Copy full SHA for c241475

File tree

-14

lines changed

-14

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ jobs:`
`52`	`52`	`include:`
`53`	`53`	`-os:macos-12`
`54`	`54`	`xcode:'13.4'`
	`55`	`+ -os:macos-12`
	`56`	`+xcode:'14.1'`
`55`	`57`	`steps:`
`56`	`58`	`-name:Set up Xcode`
`57`	`59`	`uses:maxim-lobanov/setup-xcode@v1`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ case $(uname) in`
`16`	`16`	`# Emulate a subset of os-release(5)`
`17`	`17`	`export ID=macos`
`18`	`18`	`export VERSION_ID=$(sw_vers -productVersion)`
	`19`	`+export PATH="/usr/local/bin${PATH:+:}${PATH}"`
`19`	`20`	`if [[-x /opt/homebrew/bin/brew ]];then`
`20`	`21`	`eval"$(/opt/homebrew/bin/brew shellenv)"`
`21`	`22`	`elif [[-x /usr/local/bin/brew ]];then`

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,20 +24,14 @@ if [[ $ID == macos ]]; then`
`24`	`24`	`fi`
`25`	`25`	`brew update`
`26`	`26`	`brew install --formula"${FORMULAE[@]}"`
`27`		`-`
`28`		`-if((${#PIP_PKGS[@]}));then`
`29`		`- pip3 install --upgrade --upgrade-strategy=eager"${PIP_PKGS[@]}"`
`30`		`-fi`
`31`		`-`
`32`	`27`	`elif [[$ID_LIKE==debian ]];then`
`33`	`28`	`sudo apt-get -qq update`
`34`	`29`	`sudo apt-get -qy install"${APT_PKGS[@]}"`
`35`		`-`
`36`		`-if((${#PIP_PKGS[@]}));then`
`37`		`- pip3 install --user --upgrade --upgrade-strategy=eager"${PIP_PKGS[@]}"`
`38`		`-fi`
`39`		`-`
`40`	`30`	`elif [[$ID_LIKE==fedora ]];then`
`41`		`- sudo dnf -y install gcc-c++ libasan pkgconf-pkg-config python3 \`
	`31`	`+ sudo dnf -y install gcc-c++ libasanlldpkgconf-pkg-config python3 \`
`42`	`32`	`boost-devel openssl-devel sqlite-devel`
`43`	`33`	`fi`
	`34`	`+`
	`35`	`+if((${#PIP_PKGS[@]}));then`
	`36`	`+ pip3 install --user --upgrade --upgrade-strategy=eager"${PIP_PKGS[@]}"`
	`37`	`+fi`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,7 @@ class GccBasicFlags(CompilerFlags):`
`137`	`137`	`defgetGeneralFlags(self,conf):`
`138`	`138`	`flags=super(GccBasicFlags,self).getGeneralFlags(conf)`
`139`	`139`	`flags['CXXFLAGS']+= ['-std=c++17']`
`140`		`-ifUtils.unversioned_sys_platform()=='linux':`
`141`		`-flags['LINKFLAGS']+= ['-fuse-ld=gold']`
`142`		`-elifUtils.unversioned_sys_platform()=='freebsd':`
	`140`	`+ifUtils.unversioned_sys_platform()!='darwin':`
`143`	`141`	`flags['LINKFLAGS']+= ['-fuse-ld=lld']`
`144`	`142`	`returnflags`
`145`	`143`

Comments

(0)