Skip to content

Commit a75d5b4

Browse files
committed
[android] Disable LLD when cross-compiling Android in CI.
Ubuntu 16.04 doesn't include LLD, and the included gold doesn't link Android correctly. Because of the change in e7ba154 the -B option was not passed during compiling, and the Ubuntu gold was being used in the CI (the default value for SWIFT_ENABLE_LLD_LINKER is ON, even if LLD is not present). This change sets the value to OFF in the preset, so LLD will not try to be used in CI. All other builds should be unchanged, so in other developers setups the compiling machine LLD will try to be used (which works on more recent Ubuntu versions).
1 parent b0389af commit a75d5b4

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ mixin-preset=buildbot_linux
787787

788788
release
789789
assertions
790+
extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
790791

791792
dash-dash
792793

0 commit comments

Comments
 (0)