From 0d7c0869a500da3c90399f6ee97d00e94917b1fc Mon Sep 17 00:00:00 2001 From: kai Date: Mon, 25 Jun 2012 23:42:58 +0200 Subject: [PATCH] Replace find-alt-triple.sh with CMake regular expressions. This has the advantage that it works on Windows, too. --- CMakeLists.txt | 10 +++++----- find-alt-triple.sh | 19 ------------------- 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100755 find-alt-triple.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index a5f15a91..e6c2c389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,11 +131,11 @@ set(DEFAULT_TARGET ${LLVM_HOST_TARGET} CACHE STRING "default target") add_definitions(-DDEFAULT_TARGET_TRIPLE="${DEFAULT_TARGET}") # Generate the alternate target triple (x86 on x86_64 and vice versa.) -execute_process( - COMMAND /bin/sh ${PROJECT_SOURCE_DIR}/find-alt-triple.sh ${LLVM_HOST_TARGET} - OUTPUT_VARIABLE HOST_ALT_TARGET - OUTPUT_STRIP_TRAILING_WHITESPACE -) +if(LLVM_HOST_TARGET MATCHES "i[3-9]86-") + string(REGEX REPLACE "^i[3-9]86-(.*)" "x86_64-\\1" HOST_ALT_TARGET ${LLVM_HOST_TARGET}) +elseif(LLVM_HOST_TARGET MATCHES "^x86_64-.*") + string(REGEX REPLACE "^x86_64-(.*)" "i686-\\1" HOST_ALT_TARGET ${LLVM_HOST_TARGET}) +endif() set(DEFAULT_ALT_TARGET ${HOST_ALT_TARGET} CACHE STRING "default alt target") add_definitions(-DDEFAULT_ALT_TARGET_TRIPLE="${DEFAULT_ALT_TARGET}") diff --git a/find-alt-triple.sh b/find-alt-triple.sh deleted file mode 100755 index 443f229c..00000000 --- a/find-alt-triple.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -HOST_TARGET=$1 - -[ "$HOST_TARGET" = "" ] && exit 1 - -REST=`echo $HOST_TARGET | sed -e 's/[a-zA-Z0-9_]*\(\-.*\)/\1/'` -X86=`echo $HOST_TARGET | sed -e 's/\(i[3-9]86\)\-.*/\1/'` -X86_64=`echo $HOST_TARGET | sed -e 's/\(x86_64\)\-.*/\1/'` - -ALT= -if [ "$X86_64" != "$HOST_TARGET" ]; then - ALT="i686$REST" - -elif [ "$X86" != "$HOST_TARGET" ]; then - ALT="x86_64$REST" -fi - -echo $ALT