[vlc-commits] configure: darwin: do not explicitly set ARCH_flag
Marvin Scholz
git at videolan.org
Thu Mar 26 09:09:09 CET 2020
vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Mar 11 02:10:33 2020 +0100| [2fdf9243774fed79d663f0182e129d0cc200ab06] | committer: Marvin Scholz
configure: darwin: do not explicitly set ARCH_flag
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2fdf9243774fed79d663f0182e129d0cc200ab06
---
configure.ac | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 60fdd42b18..28ea44045e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,16 +178,12 @@ case "${host_os}" in
CXXFLAGS="${CXXFLAGS} -fno-stack-check"
OBJCFLAGS="${OBJCFLAGS} -fno-stack-check"
- dnl Force gcc "-arch" flag
- ARCH_flag=""
case "${host_cpu}" in
i?86)
- ARCH_flag="-arch i386"
X86ASMFLAGS="-f macho32"
AX_APPEND_FLAG([-DPREFIX], [X86ASMDEFS])
;;
x86_64)
- ARCH_flag="-arch x86_64"
X86ASMFLAGS="-f macho64"
AX_APPEND_FLAG([-DPREFIX], [X86ASMDEFS])
;;
@@ -197,12 +193,12 @@ case "${host_os}" in
;;
esac
- CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
+ CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11"
CXX="${CXX} -stdlib=libc++ -std=c++11"
- CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
- CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
- OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag} -Werror=partial-availability"
- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
+ CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
+ CPPFLAGS="${CPPFLAGS}"
+ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 -Werror=partial-availability"
+ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
More information about the vlc-commits
mailing list