Skip to content

Commit a521488

Browse files
author
Mykola Tryshnivskyy
committed
Update gnuarm toolchain
2 parents 54c3819 + ce3c814 commit a521488

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
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

+15-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ VOO_QT_DIR=/home/jenkins/jobs/BUILD_MVM_All/workspace/build/TAMIAS/WEBKITQT48/ci
3535
ARMV7_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/armv7
3636

3737

38+
ARM_GNU_TOOLCHAIN_DIR=/opt/softs/toolchains/ARM_GNU
39+
ARM_GNU_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
40+
41+
3842
ARM_ANGSTROM_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/arm-angstrom
3943
ARM_ANGSTROM_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
4044

@@ -122,7 +126,14 @@ function SetPlatformVariable
122126
export LINK=${ARM_ANGSTROM_TOOLCHAIN_DIR}/bin/arm-angstrom-linux-gnueabi-g++
123127
export QT_DIR=${ARM_ANGSTROM_QT_DIR}
124128
;;
125-
129+
130+
ARM_GNU)
131+
export CC=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-gcc
132+
export CXX=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
133+
export LINK=${ARM_GNU_TOOLCHAIN_DIR}/bin/arm-none-linux-gnueabi-g++
134+
export QT_DIR=${ARM_GNU_QT_DIR}
135+
;;
136+
126137
esac
127138
}
128139

@@ -140,7 +151,7 @@ fi
140151
if [ "$TARGET_LIST" = "all" ]
141152
then
142153
echo "TARGET = all"
143-
TARGET_LIST="desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM"
154+
TARGET_LIST="desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM ARM_GNU"
144155
fi
145156

146157
if [ -z "$MODE_LIST" ]
@@ -154,7 +165,7 @@ then
154165
OUTDIR=`pwd`
155166
fi
156167

157-
SUPPORTED_TARGETS="desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM"
168+
SUPPORTED_TARGETS="desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM,ARM_GNU"
158169
SUPPORTED_MODES="release_dbg,release"
159170

160171
for TmpTarget in $TARGET_LIST
@@ -178,7 +189,7 @@ do
178189
echo "*************************************************"
179190
SetPlatformVariable $TmpTarget
180191
rm -f wd.gypi
181-
cp wd.gypi.${TmpTarget} wd.gypi
192+
cp platform/wd.gypi.${TmpTarget} wd.gypi
182193
if [ ! -f wd.gypi ]
183194
then
184195
echo "Create default wd.gypi"

0 commit comments

Comments
 (0)