Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
456
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
585c0b02
Commit
585c0b02
authored
3 years ago
by
Alexandre Janniaux
Committed by
Jean-Baptiste Kempf
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
apple: build.sh: add support for -fembed-bitcode-marker
parent
26231ecf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!182
Improve bitcode support in VLC
Pipeline
#138444
failed with stages
in 19 minutes and 9 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
extras/package/apple/build.sh
+11
-4
11 additions, 4 deletions
extras/package/apple/build.sh
with
11 additions
and
4 deletions
extras/package/apple/build.sh
+
11
−
4
View file @
585c0b02
...
...
@@ -98,6 +98,7 @@ VLC_REQUESTED_CORE_COUNT=0
VLC_DISABLE_DEBUG
=
0
# whether to compile with bitcode or not
VLC_USE_BITCODE
=
0
VLC_BITCODE_FLAG
=
"-fembed-bitcode"
# whether to build static or dynamic plugins
VLC_BUILD_DYNAMIC
=
0
...
...
@@ -123,7 +124,8 @@ usage()
echo
" --arch=ARCH Architecture to build for"
echo
" (i386|x86_64|armv7|arm64)"
echo
" --sdk=SDK Name of the SDK to build with (see 'xcodebuild -showsdks')"
echo
" --enable-bitcode Enable bitcode for compilation"
echo
" --enable-bitcode Enable bitcode for compilation, same as with =full"
echo
" --enable-bitcode=marker Enable bitcode marker for compilation"
echo
" --disable-debug Disable libvlc debug mode (for release)"
echo
" --verbose Print verbose output and disable multi-core use"
echo
" --help Print this help"
...
...
@@ -318,8 +320,8 @@ set_host_envvars()
local
clike_flags
=
"
$VLC_DEPLOYMENT_TARGET_CFLAG
-arch
$VLC_HOST_ARCH
-isysroot
$VLC_APPLE_SDK_PATH
$1
"
local
bitcode_flag
=
""
if
[
"
$VLC_USE_BITCODE
"
-gt
"0"
]
;
then
clike_flags+
=
"
-fembed-bitcode
"
bitcode_flag
=
"
-fembed-bitcode
"
clike_flags+
=
"
$VLC_BITCODE_FLAG
"
bitcode_flag
=
"
$VLC_BTICODE_FLAG
"
fi
export
CPPFLAGS
=
"-arch
$VLC_HOST_ARCH
-isysroot
$VLC_APPLE_SDK_PATH
"
...
...
@@ -364,6 +366,7 @@ write_config_mak()
# Flags to be used for C-like compilers (C, C++, Obj-C)
local
clike_flags
=
"
$VLC_DEPLOYMENT_TARGET_CFLAG
-arch
$VLC_HOST_ARCH
-isysroot
$VLC_APPLE_SDK_PATH
$1
"
if
[
"
$VLC_USE_BITCODE
"
-gt
"0"
]
;
then
# We use bitcode for contribs in every case, no dylib or executable built from them
clike_flags+
=
" -fembed-bitcode"
fi
...
...
@@ -453,8 +456,12 @@ do
--disable-debug
)
VLC_DISABLE_DEBUG
=
1
;;
--enable-bitcode
)
--enable-bitcode
|
--enable-bitcode
=
full
)
VLC_USE_BITCODE
=
1
;;
--enable-bitcode
=
marker
)
VLC_USE_BITCODE
=
1
VLC_BITCODE_FLAG
=
"-fembed-bitcode-marker"
;;
--arch
=
*
)
VLC_HOST_ARCH
=
"
${
1
#--arch=
}
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment