Skip to content

Fix macos arm64 local build #3962

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

Merged
Kielek merged 2 commits into from
Jan 21, 2025
Merged

Fix macos arm64 local build #3962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78a84d3
Fix macos arm64 local build
pjanotti Jan 20, 2025
16213b2
Merge branch 'main' into fix-macos-arm64-dev-build
pjanotti Jan 20, 2025
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
3 changes: 2 additions & 1 deletion build/Build.Steps.MacOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ partial class Build
{
// Create home directory
var source = NativeProfilerProject.Directory / "bin" / $"{NativeProfilerProject.Name}.dylib";
var dest = TracerHomeDirectory / "osx-x64";
var platform = Platform.ToString().ToLowerInvariant();
var dest = TracerHomeDirectory / $"osx-{platform}";
Log.Information($"Copying '{source}' to '{dest}'");

source.CopyToDirectory(dest, ExistsPolicy.FileOverwrite);
Expand Down
1 change: 0 additions & 1 deletion examples/demo/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:

client:
Expand Down
Empty file modified examples/playground/run.sh
100644 → 100755
View file
Open in desktop
Empty file.
7 changes: 4 additions & 3 deletions instrument.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ if [ -z "$OS_TYPE" ]; then
fi

# guess OS architecture if not provided
ARCHITECTURE=${ARCHITECTURE:-}
if [ -z "$ARCHITECTURE" ]; then
case $(uname -m) in
x86_64) ARCHITECTURE="x64" ;;
aarch64) ARCHITECTURE="arm64" ;;
x86_64) ARCHITECTURE="x64" ;;
aarch64|arm64) ARCHITECTURE="arm64" ;;
esac
fi

Expand All @@ -47,7 +48,7 @@ case "$OS_TYPE" in
DOTNET_RUNTIME_ID="linux-musl-$ARCHITECTURE"
;;
"macos")
DOTNET_RUNTIME_ID="osx-x64"
DOTNET_RUNTIME_ID="osx-$ARCHITECTURE"
;;
"windows")
;;
Expand Down
2 changes: 1 addition & 1 deletion ...utoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Platform>x64</Platform>
<StorePath>$(StoreOutputBasePath)</StorePath>
</StoreRuntime>
<StoreRuntime Include="arm64" Condition="$([MSBuild]::IsOSPlatform('Linux')) And '$(NukePlatform)' == 'arm64'">
<StoreRuntime Include="arm64" Condition="'$(NukePlatform)' == 'arm64'">
<Platform>arm64</Platform>
<StorePath>$(StoreOutputBasePath)</StorePath>
</StoreRuntime>
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL am
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
message(STATUS "Architecture is x86")
SET(ISX86 true)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
message(STATUS "Architecture is ARM64")
SET(ISARM64 true)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
Expand Down
2 changes: 1 addition & 1 deletion .../integrations/dependency-libs/TestApplication.ContinuousProfiler.NativeDep/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL am
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
message(STATUS "Architecture is x86")
SET(ISX86 true)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
message(STATUS "Architecture is ARM64")
SET(ISARM64 true)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
Expand Down
Loading