Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
317fca8f
Commit
317fca8f
authored
Sep 30, 2014
by
Tom Finegan
Committed by
Gerrit Code Review
Sep 30, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "iOS build configuration updates."
parents
c87f32c7
bd2a9bdd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
build/make/configure.sh
build/make/configure.sh
+11
-5
No files found.
build/make/configure.sh
View file @
317fca8f
...
...
@@ -754,6 +754,7 @@ process_common_toolchain() {
fi
done
fi
IOS_VERSION_MIN
=
"6.0"
;;
esac
...
...
@@ -788,8 +789,8 @@ process_common_toolchain() {
add_ldflags
"-mmacosx-version-min=10.9"
;;
*
-iphonesimulator-
*
)
add_cflags
"-miphoneos-version-min=
6.0
"
add_ldflags
"-miphoneos-version-min=
6.0
"
add_cflags
"-miphoneos-version-min=
${
IOS_VERSION_MIN
}
"
add_ldflags
"-miphoneos-version-min=
${
IOS_VERSION_MIN
}
"
osx_sdk_dir
=
"
$(
xcrun
--sdk
iphonesimulator
--show-sdk-path
)
"
add_cflags
"-isysroot
${
osx_sdk_dir
}
"
add_ldflags
"-isysroot
${
osx_sdk_dir
}
"
...
...
@@ -970,12 +971,11 @@ EOF
;;
darwin
*
)
XCRUN_FIND
=
"xcrun --sdk iphoneos -find"
CXX
=
"
$(
${
XCRUN_FIND
}
clang++
)
"
CC
=
"
$(
${
XCRUN_FIND
}
clang
)
"
AR
=
"
$(
${
XCRUN_FIND
}
ar
)
"
LD
=
"
$(
${
XCRUN_FIND
}
ld
)
"
LD
=
"
$
{
CXX
:-
$
(
${
XCRUN_FIND
}
ld
)
}
"
AS
=
"
$(
${
XCRUN_FIND
}
as
)
"
STRIP
=
"
$(
${
XCRUN_FIND
}
strip
)
"
NM
=
"
$(
${
XCRUN_FIND
}
nm
)
"
...
...
@@ -989,7 +989,13 @@ EOF
alt_libc
=
"
$(
xcrun
--sdk
iphoneos
--show-sdk-path
)
"
add_cflags
-arch
${
tgt_isa
}
-isysroot
${
alt_libc
}
add_ldflags
-arch
${
tgt_isa
}
-ios_version_min
7.0
add_ldflags
-arch
${
tgt_isa
}
if
[
"
${
LD
}
"
=
"
${
CXX
}
"
]
;
then
add_ldflags
-miphoneos-version-min
=
"
${
IOS_VERSION_MIN
}
"
else
add_ldflags
-ios_version_min
"
${
IOS_VERSION_MIN
}
"
fi
for
d
in
lib usr/lib usr/lib/system
;
do
try_dir
=
"
${
alt_libc
}
/
${
d
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment