Commit 7821ebf8 authored by David Fuhrmann's avatar David Fuhrmann

Revert "contrib: move macOS compilation flags to the script where they belong...

Revert "contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations"

This breaks macOS compilation.
This reverts commit 625bc3ce.
parent d6cc72ce
......@@ -113,7 +113,10 @@ endif
endif
ifdef HAVE_MACOSX
MIN_OSX_VERSION=10.7
EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
EXTRA_CXXFLAGS += -stdlib=libc++
EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
ifeq ($(ARCH),x86_64)
EXTRA_CFLAGS += -m64
EXTRA_LDFLAGS += -m64
......@@ -129,10 +132,18 @@ endif
CCAS=$(CC) -c
ifdef HAVE_IOS
CC=xcrun clang
CXX=xcrun clang++
ifdef HAVE_NEON
AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
CCAS=gas-preprocessor.pl $(CC) -c
else
CCAS=$(CC) -c
endif
AR=xcrun ar
LD=xcrun ld
STRIP=xcrun strip
RANLIB=xcrun ranlib
EXTRA_CFLAGS += $(CFLAGS)
endif
......@@ -335,7 +346,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
ifdef HAVE_DARWIN_OS
ifdef HAVE_IOS
AUTORECONF = AUTOPOINT=true autoreconf
else
AUTORECONF = autoreconf
......
#!/bin/sh
set -e
set -x
info()
{
......@@ -192,16 +193,9 @@ spopd
# enabled. (e.g. ffmpeg)
# - This will fail the build if a partially available symbol is added later on
# in contribs and not mentioned in the list of symbols above.
CFLAGS="-Werror=partial-availability "
CXXFLAGS="-Werror=partial-availability "
OBJCFLAGS="-Werror=partial-availability "
CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
export CFLAGS=${CFLAGS}
export CXXFLAGS=${CXXFLAGS}
export LDFLAGS=${LDFLAGS}
export CFLAGS="-Werror=partial-availability"
export CXXFLAGS="-Werror=partial-availability"
export OBJCFLAGS="-Werror=partial-availability"
info "Building contribs"
spushd "${vlcroot}/contrib"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment