move patch to perl.h

Perl · Apr 18, 2021 · 22bfdb2 · 22bfdb2
1 parent 957c5f2
commit 22bfdb2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/ios/build.sh b/ios/build.sh
@@ -139,11 +139,6 @@ build_perl() {
   export SDKROOT="$SDK_PATH"
   export CC=/usr/bin/clang
 
-  # missing on ios but present on tv and watch ?
-  if [ "$PERL_PLATFORM_TAG"="PERL_IOS" ]; then
-    perl -0777 -i.bak.0 -pe "s|#if defined\(__DYNAMIC__\) && defined\(PERL_DARWIN\) && defined\(PERL_CORE\)|#if defined\(__DYNAMIC__\) && defined\(PERL_DARWIN\) && defined\(PERL_CORE\) && \!TARGET_OS_IPHONE|" perl.h
-  fi
-
   # do not strip if -g in ccflags
   if [ $DEBUG -eq 1 ]; then
     perl -0777 -i.bak.0 -pe "s|(\\$\\^O eq \'darwin\');|\(\1 && \\\$Config\{\"ccflags\"\} \!\~ /-g\\\s/);|" installperl

diff --git a/perl.h b/perl.h
@@ -4890,7 +4890,7 @@ typedef OP* (*PPADDR_t[]) (pTHX);
 typedef bool (*destroyable_proc_t) (pTHX_ SV *sv);
 typedef void (*despatch_signals_proc_t) (pTHX);
 
-#if defined(__DYNAMIC__) && defined(PERL_DARWIN) && defined(PERL_CORE)
+#if defined(__DYNAMIC__) && defined(PERL_DARWIN) && defined(PERL_CORE) && !TARGET_OS_IPHONE
 #  include <crt_externs.h>	/* for the env array */
 #  define environ (*_NSGetEnviron())
 #elif defined(USE_ENVIRON_ARRAY) && !defined(environ)