Merge pull request #38744 from ml-0:feature/master/msys_on_win64_host

PiperOrigin-RevId: 307947866
Change-Id: I268787c9e4927d12dc65011a572dd204653bf768
This commit is contained in:
TensorFlower Gardener 2020-04-22 18:31:23 -07:00
commit 4aa4bba5b9
2 changed files with 11 additions and 3 deletions

View File

@ -141,7 +141,7 @@ download_and_extract() {
unzip ${tempfile} -d ${tempdir2} 2>&1 1>/dev/null unzip ${tempfile} -d ${tempdir2} 2>&1 1>/dev/null
# If the zip file contains nested directories, extract the files from the # If the zip file contains nested directories, extract the files from the
# inner directory. # inner directory.
if ls ${tempdir2}/*/* 1> /dev/null 2>&1; then if [ $(find $tempdir2/* -maxdepth 0 | wc -l) = 1 ] && [ -d $tempdir2/* ]; then
# unzip has no strip components, so unzip to a temp dir, and move the # unzip has no strip components, so unzip to a temp dir, and move the
# files we want from the tempdir to destination. # files we want from the tempdir to destination.
cp -R ${tempdir2}/*/* ${dir}/ cp -R ${tempdir2}/*/* ${dir}/

View File

@ -3,12 +3,20 @@
GEMMLOWP_URL := "https://github.com/google/gemmlowp/archive/719139ce755a0f31cbf1c37f7f98adcc7fc9f425.zip" GEMMLOWP_URL := "https://github.com/google/gemmlowp/archive/719139ce755a0f31cbf1c37f7f98adcc7fc9f425.zip"
GEMMLOWP_MD5 := "7e8191b24853d75de2af87622ad293ba" GEMMLOWP_MD5 := "7e8191b24853d75de2af87622ad293ba"
FLATBUFFERS_URL := "https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz" ifeq ($(HOST_OS),windows)
FLATBUFFERS_MD5 := "c62ffefb3d4548b127cca14ce047f16c" FLATBUFFERS_URL := "https://github.com/google/flatbuffers/archive/v1.12.0.zip"
FLATBUFFERS_MD5 := "a1afdbf114dec01a861c1b8c917d0fc7"
else
FLATBUFFERS_URL := "https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz"
FLATBUFFERS_MD5 := "c62ffefb3d4548b127cca14ce047f16c"
endif
ifeq ($(HOST_OS),osx) ifeq ($(HOST_OS),osx)
GCC_EMBEDDED_URL := "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2" GCC_EMBEDDED_URL := "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2"
GCC_EMBEDDED_MD5 := "a66be9828cf3c57d7d21178e07cd8904" GCC_EMBEDDED_MD5 := "a66be9828cf3c57d7d21178e07cd8904"
else ifeq ($(HOST_OS),windows)
GCC_EMBEDDED_URL := "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-win32.zip"
GCC_EMBEDDED_MD5 := "bc8ae26d7c429f30d583a605a4bcf9bc"
else else
GCC_EMBEDDED_URL := "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2" GCC_EMBEDDED_URL := "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2"
GCC_EMBEDDED_MD5 := "299ebd3f1c2c90930d28ab82e5d8d6c0" GCC_EMBEDDED_MD5 := "299ebd3f1c2c90930d28ab82e5d8d6c0"