Subversion Repositories DevTools

Rev

Rev 7321 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7321 Rev 7322
Line 35... Line 35...
35
#       Optional
35
#       Optional
36
#          CC_OPTS          => Additonal Compiler options
36
#          CC_OPTS          => Additonal Compiler options
37
#          CC_OPTSP         => Production Compiler options
37
#          CC_OPTSP         => Production Compiler options
38
#          CC_OPTSD         => Debug Compiler options
38
#          CC_OPTSD         => Debug Compiler options
39
#          CXX_OPTS         => Additional C++ Options
39
#          CXX_OPTS         => Additional C++ Options
-
 
40
#          LDFLAGS          => Linker flags
40
#          UNCONTROLLED     => Boolean to create warning
41
#          UNCONTROLLED     => Boolean to create warning
-
 
42
#          DEPRECATED       => Boolean to create warning
-
 
43
#          DISCONTINUED     => Boolean to create error and not build anything
41
#          PACKAGE_ARCH     => Packageing architecture
44
#          PACKAGE_ARCH     => Packageing architecture
42
#          VERSION          => Version reported by GCC
45
#          VERSION          => Version reported by GCC
43
#          MACHINE          => Machine reported by GCC
46
#          MACHINE          => Machine reported by GCC
44
#          RPATH            => Relative Path to compiler installed runtime
47
#          RPATH            => Relative Path to compiler installed runtime
45
#                              Absolute or Relative
48
#                              Absolute or Relative
Line 345... Line 348...
345
    $ToolsetConfig{$arg_alias}{BASE} = $data{BASE} . '-';
348
    $ToolsetConfig{$arg_alias}{BASE} = $data{BASE} . '-';
346
    $ToolsetConfig{$arg_alias}{CC_OPTS} = $data{CFLAGS};
349
    $ToolsetConfig{$arg_alias}{CC_OPTS} = $data{CFLAGS};
347
    $ToolsetConfig{$arg_alias}{CC_OPTSP} = $data{CFLAGSP};
350
    $ToolsetConfig{$arg_alias}{CC_OPTSP} = $data{CFLAGSP};
348
    $ToolsetConfig{$arg_alias}{CC_OPTSD} = $data{CFLAGSD};
351
    $ToolsetConfig{$arg_alias}{CC_OPTSD} = $data{CFLAGSD};
349
    $ToolsetConfig{$arg_alias}{CXX_OPTS} = $data{CXXFLAGS};
352
    $ToolsetConfig{$arg_alias}{CXX_OPTS} = $data{CXXFLAGS};
-
 
353
    $ToolsetConfig{$arg_alias}{LDFLAGS} = $data{LDFLAGS};
350
    $ToolsetConfig{$arg_alias}{VERSION} = $data{VERSION};
354
    $ToolsetConfig{$arg_alias}{VERSION} = $data{VERSION};
351
    $ToolsetConfig{$arg_alias}{MACHINE} = $data{MACHINE};
355
    $ToolsetConfig{$arg_alias}{MACHINE} = $data{MACHINE};
352
    $ToolsetConfig{$arg_alias}{COMPILER_OPTIONS} = $data{COMPILER_OPTIONS};
356
    $ToolsetConfig{$arg_alias}{COMPILER_OPTIONS} = $data{COMPILER_OPTIONS};
353
    $ToolsetConfig{$arg_alias}{RAPTH} = $data{RPATH};
357
    $ToolsetConfig{$arg_alias}{RAPTH} = $data{RPATH};
-
 
358
    $ToolsetConfig{$arg_alias}{DEPRECATED} = $data{DEPRECATED};
-
 
359
    $ToolsetConfig{$arg_alias}{DISCONTINUED} = $data{DISCONTINUED};
354
}
360
}
355
 
361
 
356
#.. Cross compile support
362
#.. Cross compile support
357
#
363
#
358
#   Toolchain=root,[bin]
364
#   Toolchain=root,[bin]
Line 374... Line 380...
374
            Error("gcc toolset: CrossPlatform Alias not configured: $arg_alias");
380
            Error("gcc toolset: CrossPlatform Alias not configured: $arg_alias");
375
        }
381
        }
376
 
382
 
377
        Warning ("Uncontrolled toolchain used: $arg_alias")
383
        Warning ("Uncontrolled toolchain used: $arg_alias")
378
            if ( exists($GCCToolchain->{UNCONTROLLED}) && $GCCToolchain->{UNCONTROLLED} );
384
            if ( exists($GCCToolchain->{UNCONTROLLED}) && $GCCToolchain->{UNCONTROLLED} );
-
 
385
 
-
 
386
        Warning ("Deprecated toolchain used: $arg_alias")
-
 
387
            if ( exists($GCCToolchain->{DEPRECATED}) && $GCCToolchain->{DEPRECATED} );
-
 
388
 
-
 
389
        Error ("Discontinued toolchain used: $arg_alias")
-
 
390
            if ( exists($GCCToolchain->{DISCONTINUED}) && $GCCToolchain->{DISCONTINUED} );
379
    }
391
    }
380
 
392
 
381
    #
393
    #
382
    #   If no Cross compiler toolchain is found (preferred method), then attempt
394
    #   If no Cross compiler toolchain is found (preferred method), then attempt
383
    #   to match a native compiler. Only known targets allow a native build
395
    #   to match a native compiler. Only known targets allow a native build
Line 424... Line 436...
424
        }
436
        }
425
        $GCCFlags = $GCCToolchain->{CC_OPTS};
437
        $GCCFlags = $GCCToolchain->{CC_OPTS};
426
        $GCCFlagsP = $GCCToolchain->{CC_OPTSP};
438
        $GCCFlagsP = $GCCToolchain->{CC_OPTSP};
427
        $GCCFlagsD = $GCCToolchain->{CC_OPTSD};
439
        $GCCFlagsD = $GCCToolchain->{CC_OPTSD};
428
        $GCCXXFlags = $GCCToolchain->{CXX_OPTS};
440
        $GCCXXFlags = $GCCToolchain->{CXX_OPTS};
-
 
441
        $LDFlags = $GCCToolchain->{LDFLAGS} if defined($GCCToolchain->{LDFLAGS});
429
        $PkgArch = $GCCToolchain->{PACKAGE_ARCH};
442
        $PkgArch = $GCCToolchain->{PACKAGE_ARCH};
430
        SetGlobalOption('PACKAGE_ARCH', $PkgArch) if defined $PkgArch;
443
        SetGlobalOption('PACKAGE_ARCH', $PkgArch) if defined $PkgArch;
431
    }
444
    }
432
    else
445
    else
433
    {
446
    {
Line 1073... Line 1086...
1073
    $io->LDDEPEND();
1086
    $io->LDDEPEND();
1074
 
1087
 
1075
#.. Package up the program and other artifacts
1088
#.. Package up the program and other artifacts
1076
#
1089
#
1077
    PackageProgAddFiles ( $name, $full );
1090
    PackageProgAddFiles ( $name, $full );
1078
    PackageProgAddFiles ( $name, $dbg );
1091
    PackageProgAddFiles ( $name, $dbg, "Class=debug" );
1079
 
1092
 
1080
}
1093
}
1081
 
1094
 
1082
  #-------------------------------------------------------------------------------
1095
  #-------------------------------------------------------------------------------
1083
# Function        : ToolsetPostprocess 
1096
# Function        : ToolsetPostprocess