diff options
author | Amar Takhar <amar@rtems.org> | 2015-03-03 09:46:11 -0500 |
---|---|---|
committer | Amar Takhar <amar@rtems.org> | 2015-12-11 15:15:54 -0500 |
commit | c25a58862f0671aea0b6655e4a29c9d4501ff374 (patch) | |
tree | ee9404eabaf0aa8462c0d141aab5ff7a0ee68472 | |
parent | 9028f5c4fc52a93c5fda65a644facc4bcfbd8d80 (diff) |
Allow for different tool versions.
Unpin the tool version from RTEMS version. There are cases where we will want
to advance the version of RTEMS beyond the current tool version.
-rw-r--r-- | rtems_waf/configure.py | 17 | ||||
-rw-r--r-- | wscript | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/rtems_waf/configure.py b/rtems_waf/configure.py index 94be70e13e..3f00c4e0f3 100644 --- a/rtems_waf/configure.py +++ b/rtems_waf/configure.py @@ -331,6 +331,7 @@ def cmd_configure(ctx, config): # Miscellanous setup. ctx.env.RTEMS_VERSION = "%d.%d.%d.%d" % (config["rtems_version_major"], config["rtems_version_minor"], config["rtems_version_revision"], config["rtems_version_patch"]) ctx.env.RTEMS_VERSION_DATA = "%d.%d" % (config["rtems_version_major"], config["rtems_version_minor"]) + ctx.env.RTEMS_TOOL_VERSION = config["rtems_tool_version"] ctx.env.append_value('CFLAGS', '-DHAVE_CONFIG_H') ctx.env.append_value('CFLAGS', '-D__rtems_%s_%s__' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_BSP.replace("-", "_"))) ctx.env.LIBDIR = "%s/lib/rtems/%s/%s-%s/" % (ctx.env.PREFIX, ctx.env.RTEMS_VERSION_DATA, ctx.env.RTEMS_ARCH, ctx.env.RTEMS_BSP) @@ -349,14 +350,14 @@ def cmd_configure(ctx, config): # Tools. - ctx.find_program('%s-rtems%s-ar' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_AR', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-as' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_AS', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-g++' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_CPP', path_list=ctx.env.PATH_TOOLS, mandatory=False) - ctx.find_program('%s-rtems%s-gcc' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_CC', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-ld' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_LD', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-nm' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_NM', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-ranlib' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_RANLIB', path_list=ctx.env.PATH_TOOLS) - ctx.find_program('%s-rtems%s-strip' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_VERSION_DATA), var='BIN_RTEMS_STRIP', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-ar' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_AR', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-as' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_AS', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-g++' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_CPP', path_list=ctx.env.PATH_TOOLS, mandatory=False) + ctx.find_program('%s-rtems%s-gcc' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_CC', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-ld' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_LD', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-nm' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_NM', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-ranlib' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_RANLIB', path_list=ctx.env.PATH_TOOLS) + ctx.find_program('%s-rtems%s-strip' % (ctx.env.RTEMS_ARCH, ctx.env.RTEMS_TOOL_VERSION), var='BIN_RTEMS_STRIP', path_list=ctx.env.PATH_TOOLS) ctx.env.AR = ctx.env.BIN_RTEMS_AR ctx.env.AS = ctx.env.BIN_RTEMS_AS ctx.env.CC = ctx.env.BIN_RTEMS_CC @@ -8,6 +8,8 @@ config["rtems_version_minor"] = 0 config["rtems_version_revision"] = 0 config["rtems_version_patch"] = 0 +config["rtems_tool_version"] = "4.11" + # --------- DO NOT EDIT BELOW THIS LINE ----------- from sys import argv from waflib import Task, Scripting, Configure, Utils |