Skip to content

Commit 5c53f89

Browse files
janicduplessisfacebook-github-bot
authored andcommitted
Fix configure glog script when building from xcodebuild
Summary: I encountered an issue when building with fastlane gym / xcodebuild where glog would not build because of missing config.h header file. I tracked it down to the ios-configure-glog.sh script that ended up error-ing because of missing valid c compiler. I guess it didn't enter the if to set c compiler env in xcodebuild and that env doesn't have proper values set like it does in xcode so just removing this check fixed it. Also tested that it still works properly in xcode. Closes #14267 Differential Revision: D5285691 Pulled By: javache fbshipit-source-id: df5315926c2d2d78806618df3d9c9bbbb974d1ea
1 parent 1230549 commit 5c53f89

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/ios-configure-glog.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22
set -e
33

4-
# Only set when not running in an Xcode context
5-
if [ -z "$ACTION" ] || [ -z "$BUILD_DIR" ]; then
6-
export CC="$(xcrun -find -sdk iphoneos cc) -arch armv7 -isysroot $(xcrun -sdk iphoneos --show-sdk-path)"
7-
export CXX="$CC"
8-
fi
4+
PLATFORM_NAME="${PLATFORM_NAME:-iphoneos}"
5+
CURRENT_ARCH="${CURRENT_ARCH:-armv7}"
6+
7+
export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
8+
export CXX="$CC"
99

1010
./configure --host arm-apple-darwin
1111

0 commit comments

Comments
 (0)