diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-26 00:34:29 -0800 |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-12-08 07:20:35 -0800 |
commit | 83f8efa61fd94697306788277d6f45944d45494e (patch) | |
tree | a7fbef48305d2dfd8d05102471cb4bc00932896d | |
parent | 0041a8b1051e06dcb235780773f6b82d6685f428 (diff) | |
download | crosstool-ng-83f8efa61fd94697306788277d6f45944d45494e.tar.gz crosstool-ng-83f8efa61fd94697306788277d6f45944d45494e.tar.bz2 crosstool-ng-83f8efa61fd94697306788277d6f45944d45494e.zip |
xtensa: Remove support for CT_CUSTOM_LOCATION_ROOT_DIR
Since CUSTOM_LOCATION_ROOT_DIR was removed from config/global/paths.in
in commit c499ccb, xtensa should depend only on it's
ARCH_XTENSA_CUSTOM_OVERLAY_LOCATION.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r-- | config/arch/xtensa.in.2 | 3 | ||||
-rw-r--r-- | scripts/build/arch/xtensa.sh | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/config/arch/xtensa.in.2 b/config/arch/xtensa.in.2 index 64ec4e6f..343cd2ce 100644 --- a/config/arch/xtensa.in.2 +++ b/config/arch/xtensa.in.2 @@ -28,5 +28,4 @@ config ARCH_XTENSA_CUSTOM_OVERLAY_LOCATION default "" help Enter the path to the directory for the custom processor - configuration file or leave blank to use the default location: - CT_CUSTOM_LOCATION_ROOT_DIR + configuration file. diff --git a/scripts/build/arch/xtensa.sh b/scripts/build/arch/xtensa.sh index 7e493127..c7bd4320 100644 --- a/scripts/build/arch/xtensa.sh +++ b/scripts/build/arch/xtensa.sh @@ -22,13 +22,7 @@ CT_ConfigureXtensa() { custom_overlay="xtensa-overlay.tar" fi - if [ -n "${CT_CUSTOM_LOCATION_ROOT_DIR}" \ - -a -z "${custom_location}" ]; then - custom_location="${CT_CUSTOM_LOCATION_ROOT_DIR}" - fi - - CT_TestAndAbort "${custom_overlay}: CT_CUSTOM_LOCATION_ROOT_DIR or CT_ARCH_XTENSA_CUSTOM_OVERLAY_LOCATION must be set." \ - -z "${CT_CUSTOM_LOCATION_ROOT_DIR}" -a -z "${custom_location}" + CT_TestAndAbort "${custom_overlay}: CT_ARCH_XTENSA_CUSTOM_OVERLAY_LOCATION must be set." -z "${custom_location}" local full_file="${custom_location}/${custom_overlay}" local basename="${component}-${version}" |