OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
93fb4a4
afdff80
)
Merge commit 'afdff8008149515afebf9992eae84be7d76e6b1e'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:28:53 +0000
(15:28 +0100)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:28:53 +0000
(15:28 +0100)
* commit '
afdff8008149515afebf9992eae84be7d76e6b1e
':
configure: Clearly state that MSYS native builds are discouraged
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
index
0198b75
,
6640f2f
..
400b98f
---
1
/
configure
---
2
/
configure
+++ b/
configure
@@@
-4415,10
-3644,13
+4415,13
@@@
case $target_os i
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
objformat="macho"
enabled x86_64 && objformat="macho64"
- enabled_any pic shared ||
+ enabled_any pic shared
x86_64
||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
;;
- mingw32*)
+ msys*)
+ die "Native MSYS builds are discouraged, please use the MINGW environment.";
+ ;;
+ mingw32*|mingw64*)
if test $target_os = "mingw32ce"; then
disable network
else