Changeset 2395
- Timestamp:
- 08/14/07 13:07:21 (1 year ago)
- Files:
-
- apbuild/trunk/Apbuild/GCC.pm (modified) (3 diffs)
- apbuild/trunk/ChangeLog (modified) (1 diff)
- apbuild/trunk/apgcc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
apbuild/trunk/Apbuild/GCC.pm
r2303 r2395 15 15 # Files with these extensions are objects 16 16 our $staticLibTypes = 'a|al'; 17 our $objectTypes = "o| so(\\.\\d+)*|la|lo|$staticLibTypes";17 our $objectTypes = "o|os|so(\\.\\d+)*|la|lo|$staticLibTypes"; 18 18 our $headerTypes = 'h|hpp'; 19 19 # Source file types … … 459 459 sub situation { 460 460 my ($self, $args) = @_; 461 462 my $files = 0; 463 for (@{$args}) { 464 $files++ if (!(/^-/)); 465 } 466 467 if ($files == 1) 468 { 469 my $i = 0; 470 for (@{$args}) 471 { 472 if (!(/^-/) && (/\.($headerTypes)$/)) 473 { 474 print($args->[$i], "\n"); 475 return 'precompiled header'; 476 } 477 $i++; 478 } 479 } 480 461 481 for (@{$args}) { 462 482 if (/^-c$/) { … … 483 503 } 484 504 485 my $files = 0;486 for (@{$args}) {487 $files++ if (!(/^-/));488 }489 490 505 if ($files == 0) { 491 506 # Situation 5 apbuild/trunk/ChangeLog
r2394 r2395 1 Tue Aug 14 17:04:32 UTC 2007 Taj Morton <tajmorton@gmail.com> 2 * apgcc: Apply patch from Unfleshed One for precompiled header support. Fixes #32. 3 * Apbuild/GCC.pm: Apply patch from Unfleshed One from precompiled header and 4 SCons/Qt4 integration. Fixes #32. 5 1 6 Tue Aug 14 16:51:30 UTC 2007 Taj Morton <tajmorton@gmail.com> 2 7 * relaytool: When running on unsupported arch, give correct apbuild/trunk/apgcc
r2377 r2395 234 234 } 235 235 exit; 236 236 } elsif ($situation eq 'precompiled header') { 237 # Extract the parameters and files 238 my (@files, @params); 239 $gcc->splitParams(\@ARGV, \@files, \@params); 240 241 # Compile each source file to an object file. 242 # Force GCC to compile C/C++ source files with older glibc symbols. 243 debug "\@files: is @files\n"; 244 foreach my $file (@files) 245 { 246 compileSource($file, \@ARGV); 247 } 237 248 } elsif ($situation eq 'compile and link') { 238 249 # Extract the parameters and files
