Skip to content

Commit

Permalink
Avoid using Xcode 15's gcc to compile glog
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenpetryk authored and joemun committed Dec 2, 2024
1 parent b4eb0ee commit 886ed9b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions packages/react-native/scripts/ios-configure-glog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ EOF
patch -p1 config.sub fix_glog_0.3.5_apple_silicon.patch
fi

XCRUN="$(which xcrun)"
if [ -n "$XCRUN" ]; then
export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
export CXX="$CC"
else
export CC="$CC:-$(which gcc)"
export CXX="$CXX:-$(which g++ || true)"
fi
export CXX="$CXX:-$CC"
# XCRUN="$(which xcrun)"
# if [ -n "$XCRUN" ]; then
# export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
# export CXX="$CC"
# else
# export CC="$CC:-$(which gcc)"
# export CXX="$CXX:-$(which g++ || true)"
# fi
# export CXX="$CXX:-$CC"

# Remove automake symlink if it exists
if [ -h "test-driver" ]; then
Expand Down

0 comments on commit 886ed9b

Please sign in to comment.