mirror of
https://github.com/shadps4-emu/ext-cryptopp.git
synced 2024-11-27 03:40:22 +00:00
Add -fno-common for Darwin builds
This commit is contained in:
parent
f6a2792353
commit
a70662dae8
@ -155,6 +155,9 @@ endif
|
||||
ifneq ($(IS_DARWIN),0)
|
||||
CXX ?= c++
|
||||
# CRYPTOPP_CXXFLAGS += -stdlib=libc++
|
||||
ifeq ($(findstring -fno-common,$(CXXFLAGS)),)
|
||||
CRYPTOPP_CXXFLAGS += -fno-common
|
||||
endif
|
||||
IS_APPLE_LIBTOOL=$(shell libtool -V 2>&1 | $(GREP) -i -c 'Apple')
|
||||
ifeq ($(IS_APPLE_LIBTOOL),1)
|
||||
AR = libtool
|
||||
|
@ -273,8 +273,8 @@ if [ -z "${XCODE_SDK}" ]; then
|
||||
[ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
|
||||
fi
|
||||
|
||||
IOS_CFLAGS="-arch ${IOS_CPU} ${MIN_VER}"
|
||||
IOS_CXXFLAGS="-arch ${IOS_CPU} ${MIN_VER} -stdlib=libc++"
|
||||
IOS_CFLAGS="-arch ${IOS_CPU} ${MIN_VER} -fno-common"
|
||||
IOS_CXXFLAGS="-arch ${IOS_CPU} ${MIN_VER} -stdlib=libc++ -fno-common"
|
||||
IOS_SYSROOT="${XCODE_DEVELOPER_SDK}/${XCODE_SDK}"
|
||||
|
||||
if [ ! -d "${IOS_SYSROOT}" ]; then
|
||||
|
@ -290,8 +290,8 @@ if [ ! -d "${XCODE_TOOLCHAIN}" ]; then
|
||||
[ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
|
||||
fi
|
||||
|
||||
MACOS_CFLAGS="-arch $MACOS_CPU $MIN_VER"
|
||||
MACOS_CXXFLAGS="-arch $MACOS_CPU $MIN_VER ${MACOS_STDLIB}"
|
||||
MACOS_CFLAGS="-arch $MACOS_CPU $MIN_VER -fno-common"
|
||||
MACOS_CXXFLAGS="-arch $MACOS_CPU $MIN_VER ${MACOS_STDLIB} -fno-common"
|
||||
MACOS_SYSROOT="${XCODE_DEVELOPER_SDK}/${XCODE_SDK}"
|
||||
|
||||
if [ ! -d "${MACOS_SYSROOT}" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user