From: Adrian Chadd <adrian.chadd@gmail.com>
Date: Sun, 9 Oct 2016 15:54:29 +0000 (-0700)
Subject: Merge pull request #104 from olerem/pre_debian-2016.10.05
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f86a69c83bc5120dfc52b54405f34469efa02b58;hp=71f757b6cacf8110c6aa98dc91fd2317ce5fe45d;p=open-ath9k-htc-firmware.git

Merge pull request #104 from olerem/pre_debian-2016.10.05

make toolchain path configurable
---

diff --git a/target_firmware/configure b/target_firmware/configure
index 0106e40..e2d4639 100755
--- a/target_firmware/configure
+++ b/target_firmware/configure
@@ -35,28 +35,24 @@
  # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ##
 
-TOOLCHAIN=$PWD/../toolchain/inst
-
 TARGET=xtensa-elf
-PREFIX="$TOOLCHAIN/bin/$TARGET-"
-TOOLCHAIN_FILE=$PWD/build/toolchain.cmake
+
+[ -z "$CROSS_COMPILE" ] &&
+    CROSS_COMPILE="$PWD/../toolchain/inst/bin/$TARGET-"
+
+TOOLCHAIN_FILE="$PWD/build/toolchain.cmake"
 
 set -e
 rm -rf build
 mkdir -p build
 
 cat > "$TOOLCHAIN_FILE" <<EOF
-INCLUDE(CMakeForceCompiler)
-
-SET(CMAKE_SYSTEM_PROCESSOR xtensa)
-SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/$TARGET)
-SET(CMAKE_STRIP :)
-
-CMAKE_FORCE_C_COMPILER(${PREFIX}gcc GNU)
+SET(CMAKE_SYSTEM_NAME Generic)
+SET(CMAKE_C_COMPILER  "${CROSS_COMPILE}gcc")
 EOF
 
 do_cmake() {
-	cmake -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE "$@"
+	cmake -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" "$@"
 }
 
 mkdir -p build/k2 build/magpie