anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-27 02:19:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the option build with different compiler and linker flag extensions.

Browse Source 
(cherry picked from commit d4f51e6ed0d92f99843ed8998823e2c0c3c1a7f4)
This commit is contained in:
Stephan Witt 2018-09-21 21:48:48 +02:00
parent f4cd2e863b
commit fa5320c910
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
development/LyX-Mac-binary-release.sh
View File

@ -403,6 +403,7 @@ case $SDKs in
;; ;;
esac esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
MYLDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
build_qt() { build_qt() {
echo Build Qt library ${QtSourceDir} echo Build Qt library ${QtSourceDir}
@ -465,7 +466,7 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
for arch in ${ARCH_LIST} ; do for arch in ${ARCH_LIST} ; do
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
"${LibMagicSourceDir}/configure"\ "${LibMagicSourceDir}/configure"\
--prefix="${LibMagicInstallDir}"\ --prefix="${LibMagicInstallDir}"\
${LibMagicConfigureOptions} ${LibMagicConfigureOptions}
@ -527,7 +528,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
for arch in ${ARCH_LIST} ; do for arch in ${ARCH_LIST} ; do
make distclean make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
"${HunSpellSourceDir}/configure"\ "${HunSpellSourceDir}/configure"\
--prefix="${HunSpellInstallDir}"\ --prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions} ${HunspellConfigureOptions}
@ -590,7 +591,7 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
for arch in ${ARCH_LIST} ; do for arch in ${ARCH_LIST} ; do
make distclean make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
CXXFLAGS=-g "${ASpellSourceDir}/configure"\ CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\ --prefix="${ASpellInstallDir}"\
${AspellConfigureOptions} ${AspellConfigureOptions}
@ -690,7 +691,7 @@ build_lyx() {
mkdir -p "${LyxBuildDir}" && cd "${LyxBuildDir}" mkdir -p "${LyxBuildDir}" && cd "${LyxBuildDir}"
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"
if [ "$configure_qt_frameworks" = "yes" ]; then if [ "$configure_qt_frameworks" = "yes" ]; then
export QT_CORE_CFLAGS="-FQtCore" export QT_CORE_CFLAGS="-FQtCore"