summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-03 15:30:56 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-03 15:30:56 +0200
commit66cbe9eee4aa97351cfd8269eec2b2ebd5762051 (patch)
treef7a3480f4e3ed8f6e80a4c4fa369b16430fd4c8a
parent904af8bc0be380ce85bf37585ebcc85692b94fcd (diff)
removed os_version, since it is not used anymore (nw)
-rw-r--r--makefile5
-rw-r--r--scripts/genie.lua8
2 files changed, 2 insertions, 11 deletions
diff --git a/makefile b/makefile
index 0ded6f9519e..db0f8ff214b 100644
--- a/makefile
+++ b/makefile
@@ -102,7 +102,6 @@ endif
ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
OS := macosx
GENIEOS := darwin
-DARWIN_VERSION := $(shell sw_vers -productVersion)
endif
ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku)
OS := haiku
@@ -741,7 +740,7 @@ linux_x86_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile
#-------------------------------------------------
$(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS) $(GENIE)
- $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --os_version=$(DARWIN_VERSION) --gcc_version=$(GCC_VERSION) gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --gcc_version=$(GCC_VERSION) gmake
.PHONY: macosx_x64
macosx_x64: generate $(PROJECTDIR)/gmake-osx/Makefile
@@ -759,7 +758,7 @@ macosx_x86: generate $(PROJECTDIR)/gmake-osx/Makefile
#-------------------------------------------------
$(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
- $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --os_version=$(DARWIN_VERSION) --gcc_version=$(CLANG_VERSION) gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) gmake
.PHONY: macosx_x64_clang
macosx_x64_clang: generate $(PROJECTDIR)/gmake-osx-clang/Makefile
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 335062eee86..a54f0d4d2a7 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -102,12 +102,6 @@ newoption {
}
newoption {
- trigger = "os_version",
- description = "OS version",
- value = "",
-}
-
-newoption {
trigger = "CC",
description = "CC replacement",
}
@@ -199,8 +193,6 @@ newoption {
}
}
-local os_version = str_to_version(_OPTIONS["os_version"])
-
if not _OPTIONS["BIGENDIAN"] then
_OPTIONS["BIGENDIAN"] = "0"
end