Skip to content
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

Removing test-driver symlink in ios third party install script #14638

Closed
wants to merge 3 commits into from
Closed

Removing test-driver symlink in ios third party install script #14638

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c837a
Removing test-driver symlink in ios third party install script
ArturKlajnerok Jun 20, 2017
75651f7
Removing test-driver symlink as part of glog configure script
ArturKlajnerok Jun 20, 2017
fe0da2e
Merge branch 'master' into test-driver-symlink-fix
javache Jun 21, 2017
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
5 changes: 5 additions & 0 deletions scripts/ios-configure-glog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ CURRENT_ARCH="${CURRENT_ARCH:-armv7}"
export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
export CXX="$CC"

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

./configure --host arm-apple-darwin

# Fix build for tvOS
Expand Down