Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
9a6d3d85
Commit
9a6d3d85
authored
Oct 10, 2014
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
Oct 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: use MAKEFLAGS env if already set
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
79740e9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
compile.sh
compile.sh
+8
-8
No files found.
compile.sh
View file @
9a6d3d85
...
...
@@ -202,14 +202,14 @@ EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CX
EXTRA_LDFLAGS
=
"-l
${
ANDROID_NDK
}
/sources/cxx-stl/gnu-libstdc++
${
CXXSTL
}
/libs/
${
ANDROID_ABI
}
/libgnustl_static.a"
# Make in //
UNAMES
=
$(
uname
-s
)
MAKEFLAGS
=
if
which
nproc
>
/dev/null
then
MAKEFLAGS
=
-j
`
nproc
`
elif
[
"
$UNAMES
"
==
"Darwin"
]
&&
which sysctl
>
/dev/null
then
MAKEFLAGS
=
-j
`
sysctl
-n
machdep.cpu.thread_count
`
if
[
-z
"
$MAKEFLAGS
"
]
;
then
UNAMES
=
$(
uname
-s
)
MAKEFLAGS
=
if
which
nproc
>
/dev/null
;
then
MAKEFLAGS
=
-j
`
nproc
`
elif
[
"
$UNAMES
"
==
"Darwin"
]
&&
which sysctl
>
/dev/null
;
then
MAKEFLAGS
=
-j
`
sysctl
-n
machdep.cpu.thread_count
`
fi
fi
# Build buildsystem tools
...
...
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