Remove cpplink, now it uses the same liblink

kivy_ios/recipes/kiwisolver/__init__.py

@@ -2,9 +2,6 @@
 This file is derived from the p4a recipe for kiwisolver.
 It is a dependency of matplotlib.
 
-It is a C++ library, and it utilizes the cpplink script to handle
-creating the library files needed for inclusion in an iOS project.
-
 It also depends on the headers from the cppy package.
 '''
 
@@ -22,17 +19,5 @@ class KiwiSolverRecipe(CythonRecipe):
     cythonize = False
     library = "libkiwisolver.a"
 
-    def get_recipe_env(self, plat):
-        env = super().get_recipe_env(plat)
-
-        # cpplink setup
-        env['CXX_ORIG'] = env['CXX']
-        env['CXX'] = join(self.ctx.root_dir, "tools", "cpplink")
-
-        # setuptools uses CC for compiling and CXX for linking
-        env['CC'] = env['CXX']
-        env['CFLAGS'] += ' -isysroot {}'.format(env['IOSSDKROOT'])
-        return env
-
 
 recipe = KiwiSolverRecipe()

kivy_ios/recipes/matplotlib/__init__.py

@@ -2,9 +2,6 @@
 This file is derived from the p4a recipe for matplotlib.
 It is a dependency of matplotlib.
 
-It is a C++ library, and it utilizes the cpplink script to handle
-creating the library files needed for inclusion in an iOS project.
-
 In addition to the original patch files for p4a, additional patch files
 are necessary to prevent duplicate symbols from appearing in the final
 link of a kivy-ios application.
@@ -113,11 +110,6 @@ def get_recipe_env(self, plat):
         numpy_inc_dir = dirname(sh.glob(numpytype.get_build_dir(plat) + '/**/_numpyconfig.h', recursive=True)[0])
 
         env['CFLAGS'] += f' -I{free_inc_dir} -I{numpy_inc_dir}'
-        env['CXX_ORIG'] = env['CXX']
-        env['CXX'] = join(self.ctx.root_dir, "tools", "cpplink")
-
-        # setuptools uses CC for compiling and CXX for linking
-        env['CFLAGS'] += ' -isysroot {}'.format(env['IOSSDKROOT'])
 
         return env
 

kivy_ios/tools/liblink

@@ -58,6 +58,9 @@ while i < len(sys.argv):
     if opt.startswith("-W"):
         continue
 
+    if opt.startswith("-stdlib="):
+        continue
+
     if opt.startswith("-"):
         print(sys.argv)
         print("Unknown option: ", opt)