diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-10-29 23:38:22 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-29 23:41:40 +0100 |
commit | a6ec2349fa866c9af18feb7d13873a19e81449e0 (patch) | |
tree | df5ea1cee6902c17dceef4243cfd5d847c7b3d4a /solenv | |
parent | gbuild: remove .a file before AR invocations: (diff) | |
download | core-a6ec2349fa866c9af18feb7d13873a19e81449e0.tar.gz core-a6ec2349fa866c9af18feb7d13873a19e81449e0.zip |
fix windows detection in linkoo
Change-Id: I18d1dbdc9d7ed6027969424a196532084537fe87
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/linkoo | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index c6e6a2b040b8..e8eff526ab7f 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -73,10 +73,6 @@ if ($ENV{'OS'} eq 'MACOSX') { print "FIXME: linkoo currently does not work on Mac OS X\n"; exit(0); } -if ($TARGET eq 'wntgcci.pro') { - $windows = 1; - $copy = 1; -} # process options for my $a (@ARGV) { @@ -119,6 +115,10 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_ ($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD); +if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntmsci[0-9]+/) { + $windows = 1; + $copy = 1; +} # setup global variables my $brand_program_dir = 'program'; |