Skip to content

Commit

Permalink
Remove hardcoded MACOSX_DEPLOYMENT_TARGET
Browse files Browse the repository at this point in the history
  • Loading branch information
messense committed Dec 8, 2022
1 parent 3f50598 commit 7c069cd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
11 changes: 7 additions & 4 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11874,10 +11874,13 @@ async function innerMain() {
await installRustTarget('x86_64-apple-darwin', rustToolchain);
}
await installRustTarget('aarch64-apple-darwin', rustToolchain);
env.DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
env.SDKROOT =
'/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk';
env.MACOSX_DEPLOYMENT_TARGET = '10.9';
if (!env.DEVELOPER_DIR) {
env.DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
}
if (!env.SDKROOT) {
env.SDKROOT =
'/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk';
}
core.endGroup();
}
let fullCommand = `${maturinPath} ${args.join(' ')}`;
Expand Down
11 changes: 7 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -702,10 +702,13 @@ async function innerMain(): Promise<void> {
await installRustTarget('x86_64-apple-darwin', rustToolchain)
}
await installRustTarget('aarch64-apple-darwin', rustToolchain)
env.DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer'
env.SDKROOT =
'/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
env.MACOSX_DEPLOYMENT_TARGET = '10.9'
if (!env.DEVELOPER_DIR) {
env.DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer'
}
if (!env.SDKROOT) {
env.SDKROOT =
'/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
}
core.endGroup()
}

Expand Down

0 comments on commit 7c069cd

Please sign in to comment.