embox

1
--- Makefile.SH-old	2023-04-27 13:40:29.554289739 +0300
2
+++ Makefile.SH	2023-04-27 13:41:13.574223503 +0300
3
@@ -469,7 +469,7 @@
4
 .c.s:
5
 	$(CCCMDSRC) -S $*.c
6
 
7
-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
8
+all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(LIBPERL) ext.libs
9
 	@echo " ";
10
 	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
11
 
12
@@ -704,11 +704,9 @@
13
 		;;
14
 	*)
15
 		$spitshell >>Makefile <<'!NO!SUBS!'
16
-miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
17
+miniperl$(EXE_EXT):
18
 	-@rm -f miniperl.xok
19
-	$(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
20
-	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
21
-	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
22
+	cp -f ../../../perl_bins/miniperl miniperl
23
 	$(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
24
 !NO!SUBS!
25
 		;;
26
@@ -716,9 +714,9 @@
27
 
28
 	$spitshell >>Makefile <<'!NO!SUBS!'
29
 
30
-perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
31
+perl$(EXE_EXT):
32
 	-@rm -f miniperl.xok
33
-	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
34
+	cp -f ../../../perl_bins/perl perl
35
 
36
 # Purify/Quantify Perls.
37
 
38
@@ -970,6 +968,7 @@
39
 	else :; \
40
 	fi
41
 	$(LDLIBPTH) $(RUN) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
42
+	cp -frT ../../../perl_bins ../../perl/bin
43
 	-@test ! -s extras.lst || $(MAKE) extras.install
44
 
45
 install.man:	all installman
46
--- ext/Errno/Errno_pm.PL_old	2023-04-26 16:44:41.593191228 +0300
47
+++ ext/Errno/Errno_pm.PL	2023-04-26 16:45:37.145465395 +0300
48
@@ -140,7 +140,7 @@
49
 	if ($dep =~ /(\S+errno\.h)/) {
50
 	     $file{$1} = 1;
51
 	}
52
-    } elsif ($^O eq 'linux' &&
53
+    } elsif ($Config{archname} eq 'linux' &&
54
 	      $Config{gccversion} ne '' && 
55
 	      $Config{gccversion} !~ /intel/i
56
 	      # might be using, say, Intel's icc
57