Skip to content

Commit ce3c814

Browse files
author
Mykola Tryshnivskyy
committed
Update gnuarm toolchain
1 parent 694d63c commit ce3c814

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed
File renamed without changes.

platform/wd.gypi.ARM_GNU

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
'variables': {
3+
'QT5': '1', # change to '1' for enabling Qt5
4+
'WD_CONFIG_WEBKIT': '0', # no WebKit support for arm
5+
'WD_BUILD_MONGOOSE': '1',
6+
'WD_BUILD_MODP_B64': '0',
7+
'WD_CONFIG_QUICK': '0',
8+
'QT_INC_PATH': '<(QT_DIR)/include',
9+
'QT_LIB_PATH': '<(QT_DIR)/lib/',
10+
'QT_BIN_PATH': '<(QT_DIR)/bin/',
11+
'MONGOOSE_INC_PATH': 'src/third_party/mongoose',
12+
},
13+
}

toolchain_builder.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ VOO_QT_DIR=/home/jenkins/jobs/BUILD_MVM_All/workspace/build/TAMIAS/WEBKITQT48/ci
3434

3535
ARMV7_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/armv7
3636

37-
GNUARM_TOOLCHAIN_DIR=/opt/softs/toolchains/ARM
38-
GNUARM_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
37+
ARM_GNU_TOOLCHAIN_DIR=/opt/softs/toolchains/ARM_GNU
38+
ARM_GNU_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
3939

4040
ARM_ANGSTROM_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/arm-angstrom
4141
ARM_ANGSTROM_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
@@ -125,11 +125,11 @@ function SetPlatformVariable
125125
export QT_DIR=${ARM_ANGSTROM_QT_DIR}
126126
;;
127127

128-
GNUARM)
129-
export CC=${GNUARM_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-gcc
130-
export CXX=${GNUARM_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
131-
export LINK=${GNUARM_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
132-
export QT_DIR=${GNUARM_QT_DIR}
128+
ARM_GNU)
129+
export CC=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-gcc
130+
export CXX=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
131+
export LINK=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
132+
export QT_DIR=${ARM_GNU_QT_DIR}
133133
;;
134134

135135
esac
@@ -149,7 +149,7 @@ fi
149149
if [ "$TARGET_LIST" = "all" ]
150150
then
151151
echo "TARGET = all"
152-
TARGET_LIST="desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM GNUARM"
152+
TARGET_LIST="desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM ARM_GNU"
153153
fi
154154

155155
if [ -z "$MODE_LIST" ]
@@ -163,7 +163,7 @@ then
163163
OUTDIR=`pwd`
164164
fi
165165

166-
SUPPORTED_TARGETS="desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM,GNUARM"
166+
SUPPORTED_TARGETS="desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM,ARM_GNU"
167167
SUPPORTED_MODES="release_dbg,release"
168168

169169
for TmpTarget in $TARGET_LIST
@@ -187,7 +187,7 @@ do
187187
echo "*************************************************"
188188
SetPlatformVariable $TmpTarget
189189
rm -f wd.gypi
190-
cp wd.gypi.${TmpTarget} wd.gypi
190+
cp platform/wd.gypi.${TmpTarget} wd.gypi
191191
if [ ! -f wd.gypi ]
192192
then
193193
echo "Create default wd.gypi"

0 commit comments

Comments
 (0)