diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-02-21 08:41:14 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-02-21 08:47:14 +0000 |
| commit | 2f30d0d0af5b459d5c0f4734d92d4b55e9dcc9b7 (patch) | |
| tree | 5d963409162f608fb51622000f00bbc624f3e036 /lib/ExtUtils | |
| parent | 1487aac67a72b9f87b24113f65b4d878401bee33 (diff) | |
| download | perl-2f30d0d0af5b459d5c0f4734d92d4b55e9dcc9b7.tar.gz | |
Re-apply changes 4adc95e616bac7ee and 200cbd6aa595a074 (RT #61492)
(ExtUtils::MM_Win32 should not generate "mt" command when CRT is statically
linked)(We'd failed to send this one upstream. Bad us.)
Diffstat (limited to 'lib/ExtUtils')
| -rw-r--r-- | lib/ExtUtils/MM_Win32.pm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 9246ca7581..c0078a412f 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue ); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.49_01'; +our $VERSION = '6.49_02'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -338,13 +338,10 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). q{ $(LD) -out:$@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) } .q{$(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) -def:$(EXPORT_LIST)}); - # VS2005 (aka VC 8) or higher, but not for 64-bit compiler from Platform SDK - if ($Config{ivsize} == 4 && $Config{cc} eq 'cl' and $Config{ccversion} =~ /^(\d+)/ and $1 >= 14) - { - push(@m, - q{ - mt -nologo -manifest $@.manifest -outputresource:$@;2 && del $@.manifest}); - } + # Embed the manifest file if it exists + push(@m, q{ + if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 + if exist $@.manifest del $@.manifest}); } push @m, ' $(CHMOD) $(PERM_RWX) $@ |