diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 01:32:41 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 01:32:41 +0000 |
| commit | 8957be0a1f3029314645d52181b0ef9bfb2ea9a5 (patch) | |
| tree | d3ffc955d22be89d9b8df4b6adb3db0a235415c3 /win32 | |
| parent | a14cb26abd9e94e845d7de891545ccdb8fb0fad9 (diff) | |
| parent | 1a621c465c9560e7209563b9aca8042abcf43dcc (diff) | |
| download | perl-8957be0a1f3029314645d52181b0ef9bfb2ea9a5.tar.gz | |
[win32] integrate mainline
p4raw-id: //depot/win32/perl@1050
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/config.bc | 4 | ||||
| -rw-r--r-- | win32/config.gc | 4 | ||||
| -rw-r--r-- | win32/config.vc | 4 | ||||
| -rw-r--r-- | win32/makefile.mk | 6 |
5 files changed, 16 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile index d860a3c1a7..a1b037f791 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -530,7 +530,7 @@ perlmain.c : runperl.c copy runperl.c perlmain.c perlmain$(o) : perlmain.c - $(CC) $(CFLAGS_O) -UPERLDLL $(EXEOUT_FLAG)$@ -c perlmain.c + $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \ diff --git a/win32/config.bc b/win32/config.bc index cd82b30471..94d4297450 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -141,6 +141,7 @@ d_index='undef' d_inetaton='undef' d_isascii='define' d_killpg='undef' +d_lchown='undef' d_link='undef' d_locconv='define' d_lockf='undef' @@ -196,6 +197,8 @@ d_seekdir='define' d_select='define' d_sem='undef' d_semctl='undef' +d_semctl_semid_ds='undef' +d_semctl_semun='undef' d_semget='undef' d_semop='undef' d_setegid='undef' @@ -260,6 +263,7 @@ d_truncate='undef' d_tzname='define' d_umask='define' d_uname='undef' +d_union_semun='define' d_vfork='undef' d_void_closedir='undef' d_voidsig='define' diff --git a/win32/config.gc b/win32/config.gc index 19b33d53b9..46dc9ac681 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -141,6 +141,7 @@ d_index='undef' d_inetaton='undef' d_isascii='define' d_killpg='undef' +d_lchown='undef' d_link='undef' d_locconv='define' d_lockf='undef' @@ -196,6 +197,8 @@ d_seekdir='define' d_select='define' d_sem='undef' d_semctl='undef' +d_semctl_semid_ds='undef' +d_semctl_semun='undef' d_semget='undef' d_semop='undef' d_setegid='undef' @@ -260,6 +263,7 @@ d_truncate='undef' d_tzname='undef' d_umask='define' d_uname='undef' +d_union_semun='define' d_vfork='undef' d_void_closedir='undef' d_voidsig='define' diff --git a/win32/config.vc b/win32/config.vc index 84ee590de0..0f8152d772 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -141,6 +141,7 @@ d_index='undef' d_inetaton='undef' d_isascii='define' d_killpg='undef' +d_lchown='undef' d_link='undef' d_locconv='define' d_lockf='undef' @@ -196,6 +197,8 @@ d_seekdir='define' d_select='define' d_sem='undef' d_semctl='undef' +d_semctl_semid_ds='undef' +d_semctl_semun='undef' d_semget='undef' d_semop='undef' d_setegid='undef' @@ -260,6 +263,7 @@ d_truncate='undef' d_tzname='define' d_umask='define' d_uname='undef' +d_union_semun='define' d_vfork='undef' d_void_closedir='undef' d_voidsig='define' diff --git a/win32/makefile.mk b/win32/makefile.mk index e77713ce68..c04fe692ad 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -691,13 +691,13 @@ perlmain.c : runperl.c copy runperl.c perlmain.c perlmain$(o) : perlmain.c - $(CC) $(CFLAGS_O) -UPERLDLL $(EXEOUT_FLAG)$@ -c perlmain.c + $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(LINK_FLAGS) \ - @$(mktmp c0x32$(o) $(PERLEXE_OBJ)\n \ - $@,\n \ + @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,\\)\n \ + $(@:s,\,\\),\n \ $(PERLIMPLIB) $(LIBFILES)\n) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -o $@ $(LINK_FLAGS) \ |