Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge commit 'ce1141982b4f7acf581d62a379f8fb49ac63f6b8' into mason07

Browse Source
This commit is contained in:
Daniel J. Hofmann
2017-02-15 11:48:43 +01:00
parent 6e18af2267 ce1141982b
commit 6468a1ba79
155 changed files with 3916 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/mason/scripts/icu/58.1/.travis.yml
Vendored
+4
View File
@@ -8,6 +8,10 @@ matrix:
- os: osx
env: MASON_PLATFORM=ios
compiler: clang
- os: linux
env: MASON_PLATFORM_VERSION=cortex_a9
- os: linux
env: MASON_PLATFORM_VERSION=i686
- os: linux
compiler: clang
sudo: false
third_party/mason/scripts/icu/58.1/script.sh
Vendored
+2 -2
View File
@@ -23,7 +23,7 @@ function mason_load_source {
}
function mason_prepare_compile {
if [[ ${MASON_PLATFORM} == 'ios' || ${MASON_PLATFORM} == 'android' ]]; then
if [[ ${MASON_PLATFORM} == 'ios' || ${MASON_PLATFORM} == 'android' || ${MASON_PLATFORM_VERSION} != `uname -m` ]]; then
mason_substep "Cross-compiling ICU. Starting with host build of ICU to generate tools."
pushd ${MASON_ROOT}/..
@@ -40,7 +40,7 @@ function mason_prepare_compile {
}
function mason_compile {
if [[ ${MASON_PLATFORM} == 'ios' || ${MASON_PLATFORM} == 'android' ]]; then
if [[ ${MASON_PLATFORM} == 'ios' || ${MASON_PLATFORM} == 'android' || ${MASON_PLATFORM_VERSION} != `uname -m` ]]; then
MASON_CROSS_BUILD=1
fi
mason_compile_base