summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile.in6
-rw-r--r--config.project2
-rw-r--r--config.usage4
-rwxr-xr-xconfigure34
-rw-r--r--sysinfo/compiler/clang.mk (renamed from sysinfo/toolchain/clang.mk)0
-rw-r--r--sysinfo/compiler/cparser.mk (renamed from sysinfo/toolchain/cparser.mk)0
-rw-r--r--sysinfo/compiler/gcc.mk (renamed from sysinfo/toolchain/gcc.mk)0
7 files changed, 23 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in
index b6976c9..5b62fea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@ BUILD = @build@
HOST = @host@
TARGET = @target@
ARCH = @arch@
-TOOLCHAIN = @toolchain@
+COMPILER = @compiler@
SYSROOT = @sysroot@
CROSS_COMPILE = @cross_compile@
SHELL = @shell@
@@ -61,7 +61,7 @@ static:
include $(PROJECT_DIR)/sysinfo/host/$(HOST).mk
-include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk
+include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk
include $(PROJECT_DIR)/project/defs.mk
include $(PROJECT_DIR)/project/tree.mk
@@ -210,7 +210,7 @@ clean:
@echo HOST:' '$(HOST)
@echo TARGET:' '$(TARGET)
@echo ARCH:' '$(ARCH)
- @echo TOOLCHAIN:' '$(TOOLCHAIN)
+ @echo COMPILER:' '$(COMPILER)
@echo SYSROOT:' '$(SYSROOT)
@echo XCOMPILE:' '$(CROSS_COMPILE)
@echo SHELL:' '$(SHELL)
diff --git a/config.project b/config.project
index 1f4c68c..b147a66 100644
--- a/config.project
+++ b/config.project
@@ -19,7 +19,7 @@ mb_default_build=
mb_default_host=
mb_default_target=
mb_default_arch=
-mb_default_toolchain=
+mb_default_compiler=
mb_default_sysroot=
mb_default_cross_compile=
mb_default_shell=sh
diff --git a/config.usage b/config.usage
index 2175510..ca4419c 100644
--- a/config.usage
+++ b/config.usage
@@ -16,7 +16,7 @@ supported switches:
--host
--target
--arch
- --toolchain
+ --compiler
--sysroot
--cross-compile
--shell
@@ -42,7 +42,7 @@ supported variables:
HOST
TARGET
ARCH
- TOOLCHAIN
+ COMPILER
SYSROOT
CROSS_COMPILE
SHELL
diff --git a/configure b/configure
index dca0d7e..7409596 100755
--- a/configure
+++ b/configure
@@ -44,7 +44,7 @@ init_vars()
mb_host=$HOST
mb_target=$TARGET
mb_arch=$ARCH
- mb_toolchain=$TOOLCHAIN
+ mb_compiler=$COMPILER
mb_sysroot=$SYSROOT
mb_cross_compile=$CROSS_COMPILE
mb_shell=$SHELL
@@ -119,7 +119,7 @@ common_defaults()
[ -z "$mb_host" ] && mb_host=$mb_default_host
[ -z "$mb_target" ] && mb_target=$mb_default_target
[ -z "$mb_arch" ] && mb_arch=$mb_default_arch
- [ -z "$mb_toolchain" ] && mb_toolchain=$mb_default_toolchain
+ [ -z "$mb_compiler" ] && mb_compiler=$mb_default_compiler
[ -z "$mb_sysroot" ] && mb_sysroot=$mb_default_sysroot
[ -z "$mb_cross_compile" ] && mb_cross_compile=$mb_default_cross_compile
[ -z "$mb_shell" ] && mb_shell=$mb_default_shell
@@ -171,10 +171,10 @@ common_defaults()
fi
fi
- # toolchain
- if [ x"$mb_toolchain" != x ]; then
+ # compiler
+ if [ x"$mb_compiler" != x ]; then
if [ x"$mb_native_cc" = x ]; then
- mb_native_cc=$mb_toolchain
+ mb_native_cc=$mb_compiler
fi
fi
}
@@ -187,7 +187,7 @@ native_defaults()
$CC -dM -E - < /dev/null > /dev/null || exit 2
fi
- # toolchain
+ # compiler
[ -z "$mb_native_cc" ] && mb_native_cc=$CC
[ -z "$mb_native_cc" ] && mb_native_cc='cc'
$mb_native_cc -dM -E - < /dev/null > /dev/null 2>/dev/null || mb_native_cc=
@@ -206,19 +206,19 @@ native_defaults()
exit 2
fi
- if [ x"$mb_toolchain" = x ]; then
- $mb_native_cc -dM -E - < /dev/null | grep '__clang__' > /dev/null && mb_toolchain='clang'
+ if [ x"$mb_compiler" = x ]; then
+ $mb_native_cc -dM -E - < /dev/null | grep '__clang__' > /dev/null && mb_compiler='clang'
fi
- if [ x"$mb_toolchain" = x ]; then
- $mb_native_cc -dM -E - < /dev/null | grep '__GCC' > /dev/null && mb_toolchain='gcc'
+ if [ x"$mb_compiler" = x ]; then
+ $mb_native_cc -dM -E - < /dev/null | grep '__GCC' > /dev/null && mb_compiler='gcc'
fi
- if [ x"$mb_toolchain" = x ]; then
- $mb_native_cc -dM -E - < /dev/null | grep '__CPARSER__' > /dev/null && mb_toolchain='cparser'
+ if [ x"$mb_compiler" = x ]; then
+ $mb_native_cc -dM -E - < /dev/null | grep '__CPARSER__' > /dev/null && mb_compiler='cparser'
fi
- if [ x"$mb_toolchain" = x ]; then
+ if [ x"$mb_compiler" = x ]; then
error_msg "config error: could not identify the native compiler."
exit 2
fi
@@ -279,7 +279,7 @@ config_copy()
-e 's^@host@^'"$mb_host"'^g' \
-e 's^@target@^'"$mb_target"'^g' \
-e 's^@arch@^'"$mb_arch"'^g' \
- -e 's^@toolchain@^'"$mb_toolchain"'^g' \
+ -e 's^@compiler@^'"$mb_compiler"'^g' \
-e 's^@sysroot@^'"$mb_sysroot"'^g' \
-e 's^@cross_compile@^'"$mb_cross_compile"'^g' \
-e 's^@shell@^'"$mb_shell"'^g' \
@@ -336,7 +336,7 @@ config_host()
make host.tag && return 0
error_msg "configure was able to generate a Makefile for the selected host,"
- error_msg "however the host-targeting toolchain was found to be missing"
+ error_msg "however the host-targeting compiler was found to be missing"
error_msg "at least one of the required headers or features."
exit 2
}
@@ -397,8 +397,8 @@ for arg ; do
--arch=*)
mb_arch=${arg#*=}
;;
- --toolchain=*)
- mb_toolchain=${arg#*=}
+ --compiler=*)
+ mb_compiler=${arg#*=}
;;
--sysroot=*)
mb_sysroot=${arg#*=}
diff --git a/sysinfo/toolchain/clang.mk b/sysinfo/compiler/clang.mk
index a372dc4..a372dc4 100644
--- a/sysinfo/toolchain/clang.mk
+++ b/sysinfo/compiler/clang.mk
diff --git a/sysinfo/toolchain/cparser.mk b/sysinfo/compiler/cparser.mk
index eea15c3..eea15c3 100644
--- a/sysinfo/toolchain/cparser.mk
+++ b/sysinfo/compiler/cparser.mk
diff --git a/sysinfo/toolchain/gcc.mk b/sysinfo/compiler/gcc.mk
index 1705859..1705859 100644
--- a/sysinfo/toolchain/gcc.mk
+++ b/sysinfo/compiler/gcc.mk