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.

Sign up for GitHub

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

Azure CI: Include macOS arm64 libraries in prebuilt Mac package #3583

Merged
merged 1 commit into from
Oct 23, 2020
Merged

Azure CI: Include macOS arm64 libraries in prebuilt Mac package #3583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 45 additions & 16 deletions .azure-pipelines/posix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ steps:
set -ex
cd ..
if [ "$CI_OS" = "osx" ]; then
sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer
# Download & extract Ninja
curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
mkdir ninja
Expand Down Expand Up @@ -269,48 +270,74 @@ steps:
displayName: 'Android: Cross-compile x86 libraries and copy to install dir'
condition: and(succeeded(), eq(variables['CI_OS'], 'android'))

# Mac: add iOS libraries (arm64 and x86_64)
# Mac: add arm64 and iOS (arm64, x86_64) libraries
- script: |
set -ex
cd ..
export PATH="$PWD/ninja:$PATH"
triple_arm64="arm64-apple-ios$IOS_DEPLOYMENT_TARGET"
triple_x64="x86_64-apple-ios$IOS_DEPLOYMENT_TARGET"
# TODO: build shared libs too, and look into `-fvisibility=hidden` requirement
triple_arm64="arm64-apple-macos"
triple_ios_arm64="arm64-apple-ios$IOS_DEPLOYMENT_TARGET"
triple_ios_x64="x86_64-apple-ios$IOS_DEPLOYMENT_TARGET"
build/bin/ldc-build-runtime --ninja -j $PARALLEL_JOBS \
--buildDir=build-libs-arm64 \
--cFlags="-target;$triple_arm64" \
--dFlags="-mtriple=$triple_arm64;-fvisibility=hidden" \
--dFlags="-mtriple=$triple_arm64" \
--ldcSrcDir=$BUILD_SOURCESDIRECTORY \
CMAKE_OSX_SYSROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk \
CMAKE_OSX_ARCHITECTURES=arm64 \
CMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
BUILD_LTO_LIBS=ON
# TODO: build shared libs too, and look into `-fvisibility=hidden` requirement
build/bin/ldc-build-runtime --ninja -j $PARALLEL_JOBS \
--buildDir=build-libs-ios-arm64 \
--cFlags="-target;$triple_ios_arm64" \
--dFlags="-mtriple=$triple_ios_arm64;-fvisibility=hidden" \
--ldcSrcDir=$BUILD_SOURCESDIRECTORY \
CMAKE_SYSTEM_NAME=iOS \
CMAKE_OSX_ARCHITECTURES=arm64 \
CMAKE_OSX_DEPLOYMENT_TARGET=$IOS_DEPLOYMENT_TARGET \
BUILD_SHARED_LIBS=OFF \
BUILD_LTO_LIBS=ON
build/bin/ldc-build-runtime --ninja -j $PARALLEL_JOBS \
--buildDir=build-libs-x86_64 \
--cFlags="-target;$triple_x64" \
--dFlags="-mtriple=$triple_x64;-fvisibility=hidden" \
--buildDir=build-libs-ios-x86_64 \
--cFlags="-target;$triple_ios_x64" \
--dFlags="-mtriple=$triple_ios_x64;-fvisibility=hidden" \
--ldcSrcDir=$BUILD_SOURCESDIRECTORY \
CMAKE_SYSTEM_NAME=iOS \
CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \
CMAKE_OSX_ARCHITECTURES=x86_64 \
CMAKE_OSX_DEPLOYMENT_TARGET=$IOS_DEPLOYMENT_TARGET \
BUILD_SHARED_LIBS=OFF \
BUILD_LTO_LIBS=ON
mkdir installed/lib-ios-{arm64,x86_64}
cp build-libs-arm64/lib/*.a installed/lib-ios-arm64
cp build-libs-x86_64/lib/*.a installed/lib-ios-x86_64
rm installed/lib-ios-{arm64,x86_64}/*-lto-debug.a
mkdir installed/lib-{arm64,ios-arm64,ios-x86_64}
cp -a build-libs-arm64/lib/*.{a,dylib} installed/lib-arm64
cp build-libs-ios-arm64/lib/*.a installed/lib-ios-arm64
cp build-libs-ios-x86_64/lib/*.a installed/lib-ios-x86_64
rm installed/lib-{arm64,ios-arm64,ios-x86_64}/*-lto-debug.a
sections="
\"arm64-apple-macos\":
{
switches = [
\"-defaultlib=phobos2-ldc,druntime-ldc\",
\"-Xcc=-target\",
\"-Xcc=$triple_arm64\",
\"-Xcc=-isysroot\",
\"-Xcc=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk\",
Copy link
Member Author

Choose a reason for hiding this comment

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

It would be good to know whether this -isysroot ... is really required for linking when using an Xcode with SDK >= 11.0, or whether it's better to leave it out and just assume the user uses an appropriate default Xcode version.

Copy link
Contributor

@p0nce p0nce Oct 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Hello, I'll get back to you this evening (I'm in CEST) about testing this.

Copy link
Contributor

Choose a reason for hiding this comment

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

I also get the gazillions of such warning, and I had assumed -fvisibility=hidden would be possible. Well I trust your judgement on this. :)

];
lib-dirs = [
\"%%ldcbinarypath%%/../lib-arm64\",
];
rpath = \"%%ldcbinarypath%%/../lib-arm64\";
};

\"arm64-apple-ios\":
{
switches = [
\"-defaultlib=phobos2-ldc,druntime-ldc\",
\"-link-defaultlib-shared=false\",
\"-fvisibility=hidden\",
\"-Xcc=-target\",
\"-Xcc=$triple_arm64\",
\"-Xcc=$triple_ios_arm64\",
\"-Xcc=-miphoneos-version-min=$IOS_DEPLOYMENT_TARGET\",
\"-Xcc=-isysroot\",
\"-Xcc=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk\",
Expand All @@ -328,7 +355,7 @@ steps:
\"-link-defaultlib-shared=false\",
\"-fvisibility=hidden\",
\"-Xcc=-target\",
\"-Xcc=$triple_x64\",
\"-Xcc=$triple_ios_x64\",
\"-Xcc=-miphoneos-version-min=$IOS_DEPLOYMENT_TARGET\",
\"-Xcc=-isysroot\",
\"-Xcc=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk\",
Expand All @@ -340,7 +367,7 @@ steps:
};"
echo "$sections" >> installed/etc/ldc2.conf
cat installed/etc/ldc2.conf
displayName: 'Mac: Cross-compile iOS libraries (arm64 and x86_64), copy to install dir and extend ldc2.conf'
displayName: 'Mac: Cross-compile arm64 and iOS (arm64, x86_64) libraries, copy to install dir and extend ldc2.conf'
condition: and(succeeded(), eq(variables['CI_OS'], 'osx'))

# Integration tests
Expand All @@ -359,9 +386,11 @@ steps:
- script: |
set -ex
cd ..
installed/bin/ldc2 -mtriple="arm64-apple-macos" hello.d -of=hello_arm64
installed/bin/ldc2 -mtriple="arm64-apple-macos" hello.d -of=hello_arm64_shared -link-defaultlib-shared
installed/bin/ldc2 -mtriple="arm64-apple-ios$IOS_DEPLOYMENT_TARGET" hello.d -of=hello_ios_arm64
installed/bin/ldc2 -mtriple="x86_64-apple-ios$IOS_DEPLOYMENT_TARGET" hello.d -of=hello_ios_x86_64
displayName: 'Mac: Cross-compile & -link hello-world for iOS'
displayName: 'Mac: Cross-compile & -link hello-world for arm64 and iOS'
condition: and(succeeded(), eq(variables['CI_OS'], 'osx'))
- script: |
set -ex
Expand Down