commit d4f51e6ed0d92f99843ed8998823e2c0c3c1a7f4
Author: Stephan Witt <[email protected]>
Date: Fri Sep 21 21:48:48 2018 +0200
Add the option build with different compiler and linker flag extensions.
---
development/LyX-Mac-binary-release.sh | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/development/LyX-Mac-binary-release.sh
b/development/LyX-Mac-binary-release.sh
index 97dfe40..12fdfdd 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -394,6 +394,7 @@ case $SDKs in
;;
esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+MYLDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
build_qt() {
echo Build Qt library ${QtSourceDir}
@@ -456,7 +457,7 @@ if [ -d "${LibMagicSourceDir}" -a ! -f
"${LibMagicInstallHdr}" ]; then
for arch in ${ARCH_LIST} ; do
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"\
--prefix="${LibMagicInstallDir}"\
${LibMagicConfigureOptions}
@@ -518,7 +519,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f
"${HunSpellInstallHdr}" ]; then
for arch in ${ARCH_LIST} ; do
make distclean
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"\
--prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions}
@@ -581,7 +582,7 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}"
-a "yes" = "${aspell_
for arch in ${ARCH_LIST} ; do
make distclean
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"\
--prefix="${ASpellInstallDir}"\
${AspellConfigureOptions}
@@ -677,7 +678,7 @@ build_lyx() {
mkdir -p "${LyxBuildDir}" && cd "${LyxBuildDir}"
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
export QT_CORE_CFLAGS="-FQtCore"