summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-04-01 02:32:56 +1100
committer Vas Crabb <vas@vastheman.com>2015-04-01 03:03:17 +1100
commit399a5f914b3e21f0cbeefa395c8a5fe8cbff1a7b (patch)
tree1cfd7e4222aed68e5f5931056056a7324ab09831
parent5c0388525233d7d802dfd087139899b4e7b6eb64 (diff)
Get rid of unnecessary distro nonsense
-rw-r--r--makefile26
-rw-r--r--scripts/genie.lua8
-rw-r--r--scripts/toolchain.lua16
3 files changed, 0 insertions, 50 deletions
diff --git a/makefile b/makefile
index f4d21d146ed..7e6467cfb47 100644
--- a/makefile
+++ b/makefile
@@ -169,35 +169,9 @@ DISTRO := generic
else
ifeq ($(DISTRO),debian-stable)
else
-ifeq ($(DISTRO),ubuntu-intrepid)
-# Force gcc-4.2 on ubuntu-intrepid
-CC := $(SILENT)gcc -V 4.2
-LD := $(SILENT)g++-4.2
-else
-ifeq ($(DISTRO),gcc44-generic)
-CC := $(SILENT)gcc-4.4
-LD := $(SILENT)g++-4.4
-else
-ifeq ($(DISTRO),gcc45-generic)
-CC := $(SILENT)gcc-4.5
-LD := $(SILENT)g++-4.5
-else
-ifeq ($(DISTRO),gcc46-generic)
-CC := $(SILENT)gcc-4.6
-LD := $(SILENT)g++-4.6
-else
-ifeq ($(DISTRO),gcc47-generic)
-CC := $(SILENT)gcc-4.7
-LD := $(SILENT)g++-4.7
-else
$(error DISTRO $(DISTRO) unknown)
endif
endif
-endif
-endif
-endif
-endif
-endif
PARAMS+= --distro=$(DISTRO)
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 906eeeb13d3..11fa2fed3a5 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -84,10 +84,6 @@ newoption {
{ "generic", "generic" },
{ "debian-stable", "debian-stable" },
{ "ubuntu-intrepid", "ubuntu-intrepid" },
- { "gcc44-generic", "gcc44-generic" },
- { "gcc45-generic", "gcc45-generic" },
- { "gcc46-generic", "gcc46-generic" },
- { "gcc47-generic", "gcc47-generic" },
},
}
@@ -698,10 +694,6 @@ configuration { "linux-*" }
links {
"dl",
}
- defines
- {
- "DISTRO=" .. _OPTIONS["distro"] ,
- }
if _OPTIONS["distro"]=="debian-stable" then
defines
{
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 362cfa9ebb0..f96c2982633 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -154,22 +154,6 @@ function toolchain(_buildDir, _subDir)
premake.gcc.cc = "@gcc -V 4.2"
premake.gcc.cxx = "@g++-4.2"
end
- if _OPTIONS["distro"]=="gcc44-generic" then
- premake.gcc.cc = "@gcc-4.4"
- premake.gcc.cxx = "@g++-4.4"
- end
- if _OPTIONS["distro"]=="gcc45-generic" then
- premake.gcc.cc = "@gcc-4.5"
- premake.gcc.cxx = "@g++-4.5"
- end
- if _OPTIONS["distro"]=="gcc46-generic" then
- premake.gcc.cc = "@gcc-4.6"
- premake.gcc.cxx = "@g++-4.6"
- end
- if _OPTIONS["distro"]=="gcc47-generic" then
- premake.gcc.cc = "@gcc-4.7"
- premake.gcc.cxx = "@g++-4.7"
- end
premake.gcc.ar = "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
end