iOS, cleanup unused config variables

Removed no longer used variables. These variables
are constant across platform, and therefore defined
in the project.pbxproj file instead.

Change-Id: I8fcfe414de498ebd4e5bd3a133a8c7e39faa9edb

3 files changed, 10 insertions, 47 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index eae6050bc262..5dd5d1481ad5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -620,9 +620,7 @@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
 export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
-export IOS_DEBUG_INFORMATION_FORMAT=@IOS_DEBUG_INFORMATION_FORMAT@
-export IOS_CLANG_CXX_LIBRARY=@IOS_CLANG_CXX_LIBRARY@
-export IOS_ARCHS=@IOS_ARCHS@
+export IOS_ARCH=@IOS_ARCH@
 export IOS_SDK=@IOS_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
diff --git a/configure.ac b/configure.ac
index 0b184164e43a..204241efc67b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2872,12 +2872,12 @@ if test $_os = iOS; then
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=9.3
-        IOS_ARCHS=x86_64
+        IOS_ARCH=x86_64
         BITNESS=-fembed-bitcode
     else
         platform=iPhoneOS
         versionmin=-miphoneos-version-min=9.3
-        IOS_ARCHS=arm64
+        IOS_ARCH=arm64
         BITNESS=-fembed-bitcode
     fi
     xcode_developer=`xcode-select -print-path`
@@ -2909,11 +2909,10 @@ if test $_os = iOS; then
     # get compiled with it, to avoid ld warnings when linking all that together into one
     # executable.
 
-    IOS_CLANG_CXX_LIBRARY=libc++
-    stdlib="-stdlib=$IOS_CLANG_CXX_LIBRARY"
+    stdlib="-stdlib=libc++"
 
-    CC="`xcrun -find clang` -arch $IOS_ARCHS -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
-    CXX="`xcrun -find clang++` -arch $IOS_ARCHS -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"
+    CC="`xcrun -find clang` -arch $IOS_ARCH -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
+    CXX="`xcrun -find clang++` -arch $IOS_ARCH -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"
 
     INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
     AR=`xcrun -find ar`
@@ -2923,8 +2922,7 @@ if test $_os = iOS; then
     RANLIB=`xcrun -find ranlib`
 fi
 
-AC_SUBST(IOS_CLANG_CXX_LIBRARY)
-AC_SUBST(IOS_ARCHS)
+AC_SUBST(IOS_ARCH)
 AC_SUBST(IOS_SDK)
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
@@ -3868,15 +3866,6 @@ if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG"
     fi
 fi
 
-# Debug information format for iOS. Running dsymutil takes a long time... you really need a separate
-# .dSYM only if running Instruments, I think. (Not for normal debugging in Xcode.) To enable a
-# separate .dSYM, either use --enable-release-build or change manually to "DWARF with DSYM" in Xcode.
-IOS_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
-if test "$enable_release_build" != yes -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \); then
-    IOS_DEBUG_INFORMATION_FORMAT=dwarf
-fi
-AC_SUBST(IOS_DEBUG_INFORMATION_FORMAT)
-
 AC_MSG_CHECKING([whether to compile with optimization flags])
 if test -z "$enable_optimized"; then
     if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 46391e89eca3..c6a7cad37a0a 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -30,25 +30,13 @@ $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT)
 $(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk 
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 	@echo "// Xcode configuration properties" > $(IOSKITXC)
-	@echo "// To avoid confusion, the LO-specific ones that aren't as such used" >> $(IOSKITXC)
-	@echo "// Xcode (but only expanded in option values) are prefixed with" >> $(IOSKITXC)
-	@echo "// LO_.\n" >> $(IOSKITXC)
 	@echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSKITXC)
 	@echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSKITXC)
 	@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKITXC)
 	@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKITXC)
-	@echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSKITXC)
-	@echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSKITXC)
-	@echo "// what they will be used for." >> $(IOSKITXC)
-	@echo "ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC)
-	@echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC)
-	@echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSKITXC)
-	@echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSKITXC)
-	@echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSKITXC)
-
 	@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC)
 	@echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC)
-	@echo PRELINK_LIBS = "`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC)
+	@echo "PRELINK_LIBS = `$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC)
 	@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosKit.map "  >> $(IOSKITXC)
 	@echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKITXC)
 
@@ -56,22 +44,10 @@ $(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 	@mkdir -p $(IOSGEN);
 	@echo "// Xcode configuration properties" > $(IOSAPPXC)
-	@echo "// To avoid confusion, the LO-specific ones that aren't as such used" >> $(IOSAPPXC)
-	@echo "// Xcode (but only expanded in option values) are prefixed with" >> $(IOSAPPXC)
-	@echo "// LO_.\n" >> $(IOSAPPXC)
 	@echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSAPPXC)
 	@echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSAPPXC)
 	@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSAPPXC)
 	@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSAPPXC)
-	@echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSAPPXC)
-	@echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSAPPXC)
-	@echo "// what they will be used for." >> $(IOSAPPXC)
-	@echo "ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC)
-	@echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC)
-	@echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSAPPXC)
-	@echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPPXC)
-	@echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSAPPXC)
-
 	@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC)
 	@echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC)
 	@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosApp.map " >> $(IOSAPPXC)
@@ -150,7 +126,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup
 	        -project $(IOSKITPRJ) \
 	        -target LibreOfficeKit \
 	        -sdk $(IOS_SDK) \
-	        -arch $(IOS_ARCHS) \
+	        -arch $(IOS_ARCH) \
 	        -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 	        build \
 	        , $(WORKDIR)/ios/build.log \
@@ -169,7 +145,7 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
 	        -project $(IOSAPPPRJ) \
 	        -target LibreOfficeLight \
 	        -sdk $(IOS_SDK) \
-	        -arch $(IOS_ARCHS) \
+	        -arch $(IOS_ARCH) \
 	        -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 	        build \
 	        , $(WORKDIR)/ios/build.log \