Skip to content

Configuration - Fix ARCH for older 32-bit macs#626

Merged
dpasukhi merged 1 commit intoOpen-Cascade-SAS:IRfrom
dpasukhi:darwin_32
Jul 19, 2025
Merged

Configuration - Fix ARCH for older 32-bit macs#626
dpasukhi merged 1 commit intoOpen-Cascade-SAS:IRfrom
dpasukhi:darwin_32

Conversation

@dpasukhi
Copy link
Copy Markdown
Member

Fix architecture check in environment setup scripts to include arm64

Fix architecture check in environment setup scripts to include arm64
@dpasukhi dpasukhi added this to the Release 7.9.2 milestone Jul 19, 2025
@dpasukhi dpasukhi requested a review from Copilot July 19, 2025 08:38
@dpasukhi dpasukhi self-assigned this Jul 19, 2025
@dpasukhi dpasukhi added 2. Enhancement New feature or request 1. Configuration CMake/QMake processes of OCCT or samples labels Jul 19, 2025
@dpasukhi dpasukhi linked an issue Jul 19, 2025 that may be closed by this pull request
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR fixes architecture detection in environment setup scripts to properly handle ARM-based architectures and removes redundant ARCH overrides for Darwin systems. The changes ensure that both aarch64 and arm64 architectures are correctly identified as 64-bit systems.

  • Updates architecture detection conditions to include aarch64 and arm64 as 64-bit architectures
  • Removes redundant ARCH="64" assignment for Darwin systems since it's already handled by the architecture check
  • Fixes a syntax error in the existing aarch64 condition

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
adm/templates/env.sh Updates architecture detection logic and removes Darwin-specific ARCH override
adm/templates/env.install.sh.in Applies same architecture detection fixes and syntax correction

# ----- Set path to 3rd party and OCCT libraries -----
anArch=`uname -m`
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ] && [ "$anArch" != "aarch64"]; then
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ] && [ "$anArch" != "aarch64" ] && [ "$anArch" != "arm64" ]; then
Copy link

Copilot AI Jul 19, 2025

Choose a reason for hiding this comment

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

The original line had a syntax error with missing space before the closing bracket in 'aarch64"]; then'. This fix correctly addresses that syntax issue.

Copilot uses AI. Check for mistakes.
@dpasukhi dpasukhi merged commit 5973883 into Open-Cascade-SAS:IR Jul 19, 2025
23 checks passed
@dpasukhi dpasukhi deleted the darwin_32 branch July 19, 2025 10:04
@github-project-automation github-project-automation bot moved this from Todo to Done in Maintenance Jul 19, 2025
dpasukhi added a commit that referenced this pull request Sep 6, 2025
- Updates architecture detection conditions to include aarch64 and arm64 as 64-bit architectures
- Removes redundant ARCH="64" assignment for Darwin systems since it's already handled by the architecture check
- Fixes a syntax error in the existing aarch64 condition
dpasukhi added a commit that referenced this pull request Sep 6, 2025
- Updates architecture detection conditions to include aarch64 and arm64 as 64-bit architectures
- Removes redundant ARCH="64" assignment for Darwin systems since it's already handled by the architecture check
- Fixes a syntax error in the existing aarch64 condition
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1. Configuration CMake/QMake processes of OCCT or samples 2. Enhancement New feature or request

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

templates/env.sh: Fix ARCH for older 32-bit macs

2 participants