From a41651b62ff13fd89aafefd5c1e0ef7a6e5b31ad Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 22 Aug 2024 18:03:49 +0800
Subject: [PATCH] rename 3rdparty to openlibs and rename CROSSTOOL to CROSS_COMPILER
---
openlibs/cJSON/build.sh | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/3rdparty/cJSON/build.sh b/openlibs/cJSON/build.sh
similarity index 80%
rename from 3rdparty/cJSON/build.sh
rename to openlibs/cJSON/build.sh
index e125f1b..69e60a3 100755
--- a/3rdparty/cJSON/build.sh
+++ b/openlibs/cJSON/build.sh
@@ -11,7 +11,7 @@
LYFTP_SRC=http://master.weike-iot.com:2211/src/
-CROSSTOOL=/opt/gcc-aarch32-10.3-2021.07/bin/arm-none-linux-gnueabihf-
+CROSS_COMPILE=/opt/gcc-aarch32-10.3-2021.07/bin/arm-none-linux-gnueabihf-
mkdir -p ${PREFIX_PATH}
@@ -39,15 +39,15 @@
function export_cross()
{
# export cross toolchain
- export CC=${CROSSTOOL}gcc
- export CXX=${CROSSTOOL}g++
- export AS=${CROSSTOOL}as
- export AR=${CROSSTOOL}ar
- export LD=${CROSSTOOL}ld
- export NM=${CROSSTOOL}nm
- export RANLIB=${CROSSTOOL}ranlib
- export OBJDUMP=${CROSSTOOL}objdump
- export STRIP=${CROSSTOOL}strip
+ export CC=${CROSS_COMPILE}gcc
+ export CXX=${CROSS_COMPILE}g++
+ export AS=${CROSS_COMPILE}as
+ export AR=${CROSS_COMPILE}ar
+ export LD=${CROSS_COMPILE}ld
+ export NM=${CROSS_COMPILE}nm
+ export RANLIB=${CROSS_COMPILE}ranlib
+ export OBJDUMP=${CROSS_COMPILE}objdump
+ export STRIP=${CROSS_COMPILE}strip
# export cross configure
export CONFIG_CROSS=" --build=i686-pc-linux --host=arm-linux "
@@ -81,7 +81,7 @@
cd ${SRC_NAME}
- sed -i -e "s|^CC.*|CC = ${CROSSTOOL}gcc -std=c89|g" Makefile
+ sed -i -e "s|^CC.*|CC = ${CROSS_COMPILE}gcc -std=c89|g" Makefile
sed -i -e "s|^PREFIX.*|PREFIX = ${PREFIX_PATH}|g" Makefile
make
--
Gitblit v1.9.1