mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ok, doing this work on a different branch for yet.

Browse source 
Revert "iphone-config.site: CPPFLAGS is NOT equivalent to CXXFLAGS! Use the second instead of the previous to avoid duplicates flags (CPP=C preprocessor)"

This reverts commit 7cfd988c03.
This commit is contained in:
Gautier Pelloux-Prayer 2015-02-25 14:43:00 +01:00
parent 7cfd988c03
commit 84fc91a532
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
submodules/build/iphone-config.site
View file

@ -40,17 +40,16 @@ echo "Selecting SDK path = ${SYSROOT_PATH}"
COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
#workaround for polarssl conflicting symbols
COMMON_FLAGS="$COMMON_FLAGS -Dsha256=polarssl_sha256"
COMMON_FLAGS="$COMMON_FLAGS -Werror"
# silence clang unused operators. This is temporary, we should find a way to compile 3rd party with correct flags :(
COMMON_FLAGS="$COMMON_FLAGS -Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future"
COMMON_FLAGS="-Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future $COMMON_FLAGS"
# you can use ccache to speed up build, in which case just define LINPHONE_CCACHE to 'ccache'
if test "$LINPHONE_CCACHE" = "ccache" ; then
# ccache doesn't like some options
COMMON_FLAGS="$COMMON_FLAGS -Wno-variadic-macros -Wno-pointer-arith -Wno-return-type -Wno-tautological-compare -Wno-unused-function"
COMMON_FLAGS="$COMMON_FLAGS -Wno-variadic-macros -Wno-pointer-arith -Wno-return-type -Wno-tautological-compare -Wno-unused-function -Wno-error"
fi
CC="xcrun $LINPHONE_CCACHE clang"
@ -62,11 +61,10 @@ RANLIB="xcrun ranlib"
STRIP="xcrun strip"
NM="xcrun nm"
LDFLAGS="-arch ${ARCH}" #Linker flags
CPPFLAGS="-Dasm=__asm" #C preprocessor flags
CFLAGS="$COMMON_FLAGS -std=c99" #C flags
CXXFLAGS="$COMMON_FLAGS" #C++ flags
OBJCFLAGS="$COMMON_FLAGS -std=c99 -x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" #ObjectiveC flags
LDFLAGS="-arch ${ARCH}"
CFLAGS="$COMMON_FLAGS -std=c99"
CPPFLAGS="$COMMON_FLAGS -Dasm=__asm"
OBJCFLAGS="$COMMON_FLAGS -std=c99 -x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch"
#Force install script to use -C so that header files don't get re-written if not changed.
INSTALL_DATA="ginstall -C"