Changeset 3188 for trunk/essentials/dev-lang/perl/os2/Makefile.SHs

Timestamp:

Apr 22, 2007, 10:57:48 AM (18 years ago)

Author:

bird

Message:

Applied patch from Paul (aka Creeping).

File:

• trunk/essentials/dev-lang/perl/os2/Makefile.SHs (modified) (9 diffs)

trunk/essentials/dev-lang/perl/os2/Makefile.SHs

@@ -43 +43 @@
 SO_CCCMD        = \$(CC) $ccflags \$(OPTIMIZE)
 
-LD_OPT          = \$(OPTIMIZE)
-PERL_DLL_LD_OPT = -Zmap -Zlinker /map/li
+LD_OPT          = 
+PERL_DLL_LD_OPT = -Zdll -Zmap -Zargs-wild
 
 PERL_DLL_BASE   = perl$dll_post
@@ -72 +72 @@
 
 libperl_dllmain.imp: imp_version
-        echo    'main   $(PERL_DLL_BASE)        dll_perlmain    ?' >> $@
+        echo    '_main  $(PERL_DLL_BASE)        _dll_perlmain   ?' >> $@
 
 libperl_dllmain.lib: libperl_dllmain.imp
@@ -144 +144 @@
 
 miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT)
-        $(CC) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) `echo $(obj)|sed -e 's/\bop\./opmini./g'` $(libs) -Zmap -Zlinker /map/PM:VIO
+        $(CC) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) `echo $(obj)|sed -e 's/\bop\./opmini./g'` $(libs) -Zmap -Zargs-wild
         @./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 
@@ -171 +171 @@
 
 perl___$(EXE_EXT) perl___: $& libperl_dllmain$(LIB_EXT)
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o perl___ libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 8192 -o perl___8 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 4096 -o perl___4 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 2048 -o perl___2 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 1024 -o perl___1 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 512 -o perl___05 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
-        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 320 -o perl___03 libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o perl___ libperl_dllmain$(LIB_EXT) 
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 8192 -o perl___8 libperl_dllmain$(LIB_EXT) 
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 4096 -o perl___4 libperl_dllmain$(LIB_EXT)  
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 2048 -o perl___2 libperl_dllmain$(LIB_EXT) 
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 1024 -o perl___1 libperl_dllmain$(LIB_EXT) 
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 512 -o perl___05 libperl_dllmain$(LIB_EXT) 
+        $(SHRPENV) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -Zstack 320 -o perl___03 libperl_dllmain$(LIB_EXT) 
 
 # This one is compiled -Zsys, so cannot do many things:
@@ -187 +187 @@
 
 perl_stat perl_stat$(EXE_EXT): $& libperl_dllmain$(LIB_EXT)
-        $(SHRPENV) $(CC) $(STAT_CLDFLAGS) $(CCDLFLAGS) -o perl_stat libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
+        $(SHRPENV) $(CC) $(STAT_CLDFLAGS) $(CCDLFLAGS) -o perl_stat libperl_dllmain$(LIB_EXT)  
 
 # Remove -Zcrtdll, add -Zsys
@@ -195 +195 @@
 
 perl_sys perl_sys$(EXE_EXT): $& libperl_dllmain$(LIB_EXT)
-        $(SHRPENV) $(CC) $(SYS_CLDFLAGS) $(CCDLFLAGS) -o perl_sys libperl_dllmain$(LIB_EXT) -Zlinker /map/PM:VIO
+        $(SHRPENV) $(CC) $(SYS_CLDFLAGS) $(CCDLFLAGS) -o perl_sys libperl_dllmain$(LIB_EXT)  
 
 installcmd : 
@@ -269 +269 @@
 
 perl__$(EXE_EXT) perl__: $& libperl_dllmain$(LIB_EXT)
-        $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o perl__ libperl_dllmain$(LIB_EXT) -Zlinker /PM:PM
+        $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o perl__ libperl_dllmain$(LIB_EXT) -Zlinker /PM:PM 
 
 # Forking dynamically loaded perl:
@@ -293 +293 @@
 
 # Remove -Zexe, add -Zdll -Zso.  No stack needed
-SO_CLDFLAGS = -Zdll -Zso -Zomf -Zmt -Zsys
+SO_CLDFLAGS = -Zdll -Zomf
 
 # A callable-from-REXX DLL
@@ -304 +304 @@
         echo    "DESCRIPTION '@#perl5-porters@perl.org:`miniperl -Ilib -MConfig -e 'print \$$]'`#@ REXX to Perl `miniperl -Ilib -MConfig -e 'print \$$Config{version}'` interface'" >> $@
         echo    "EXPORTS"                                       >> $@
-        echo    '  "PERL"'                                      >> $@
-        echo    '  "PERLTERM"'                                  >> $@
-        echo    '  "PERLINIT"'                                  >> $@
-        echo    '  "PERLEXIT"'                                  >> $@
-        echo    '  "PERLEVAL"'                                  >> $@
-        echo    '  "PERLLASTERROR"'                             >> $@
-        echo    '  "PERLEVALSUBCOMMAND"'                        >> $@
-        echo    '  "PERLEXPORTALL"'                             >> $@
-        echo    '  "PERLDROPALL"'                               >> $@
-        echo    '  "PERLDROPALLEXIT"'                           >> $@
+        echo    '  "_PERL"'                                     >> $@
+        echo    '  "_PERLTERM"'                                 >> $@
+        echo    '  "_PERLINIT"'                                 >> $@
+        echo    '  "_PERLEXIT"'                                 >> $@
+        echo    '  "_PERLEVAL"'                                 >> $@
+        echo    '  "_PERLLASTERROR"'                            >> $@
+        echo    '  "_PERLEVALSUBCOMMAND"'                       >> $@
+        echo    '  "_PERLEXPORTALL"'                            >> $@
+        echo    '  "_PERLDROPALL"'                              >> $@
+        echo    '  "_PERLDROPALLEXIT"'                          >> $@