@@ -1203,6 +1203,7 @@ enum LinuxDistro {
1203
1203
Fedora14,
1204
1204
OpenSuse11_3,
1205
1205
UbuntuJaunty,
1206
+ UbuntuKarmic,
1206
1207
UbuntuLucid,
1207
1208
UbuntuMaverick,
1208
1209
UnknownDistro
@@ -1221,7 +1222,8 @@ static bool IsDebian(enum LinuxDistro Distro) {
1221
1222
}
1222
1223
1223
1224
static bool IsUbuntu (enum LinuxDistro Distro) {
1224
- return Distro == UbuntuLucid || Distro == UbuntuMaverick || Distro == UbuntuJaunty;
1225
+ return Distro == UbuntuLucid || Distro == UbuntuMaverick ||
1226
+ Distro == UbuntuJaunty || Distro == UbuntuKarmic;
1225
1227
}
1226
1228
1227
1229
static bool IsDebianBased (enum LinuxDistro Distro) {
@@ -1254,6 +1256,8 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
1254
1256
return UbuntuLucid;
1255
1257
else if (Lines[i] == " DISTRIB_CODENAME=jaunty" )
1256
1258
return UbuntuJaunty;
1259
+ else if (Lines[i] == " DISTRIB_CODENAME=karmic" )
1260
+ return UbuntuKarmic;
1257
1261
}
1258
1262
return UnknownDistro;
1259
1263
}
@@ -1342,7 +1346,7 @@ Linux::Linux(const HostInfo &Host, const llvm::Triple& Triple)
1342
1346
GccTriple = " i586-suse-linux" ;
1343
1347
}
1344
1348
1345
- const char * GccVersions[] = {" 4.5.1" , " 4.5" , " 4.4.5" , " 4.4.4" , " 4.4.3" ,
1349
+ const char * GccVersions[] = {" 4.5.1" , " 4.5" , " 4.4.5" , " 4.4.4" , " 4.4.3" , " 4.4 " ,
1346
1350
" 4.3.3" , " 4.3.2" };
1347
1351
std::string Base = " " ;
1348
1352
for (unsigned i = 0 ; i < sizeof (GccVersions)/sizeof (char *); ++i) {
@@ -1392,14 +1396,16 @@ Linux::Linux(const HostInfo &Host, const llvm::Triple& Triple)
1392
1396
if (IsFedora (Distro) || Distro == UbuntuMaverick)
1393
1397
ExtraOpts.push_back (" --hash-style=gnu" );
1394
1398
1395
- if (IsDebian (Distro) || Distro == UbuntuLucid || Distro == UbuntuJaunty)
1399
+ if (IsDebian (Distro) || Distro == UbuntuLucid || Distro == UbuntuJaunty ||
1400
+ Distro == UbuntuKarmic)
1396
1401
ExtraOpts.push_back (" --hash-style=both" );
1397
1402
1398
1403
if (IsFedora (Distro))
1399
1404
ExtraOpts.push_back (" --no-add-needed" );
1400
1405
1401
1406
if (Distro == DebianSqueeze || IsOpenSuse (Distro) ||
1402
- IsFedora (Distro) || Distro == UbuntuLucid || Distro == UbuntuMaverick)
1407
+ IsFedora (Distro) || Distro == UbuntuLucid || Distro == UbuntuMaverick ||
1408
+ Distro == UbuntuKarmic)
1403
1409
ExtraOpts.push_back (" --build-id" );
1404
1410
1405
1411
Paths.push_back (Base + Suffix);
0 commit comments