Skip to content

Commit 19e6e51

Browse files
author
ARC GNU Verification
committed
Merge branch 'arc-dev' into arc-staging
2 parents 285526c + 827876f commit 19e6e51

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,14 @@ add EPEL repository, then install Mingw from it. In CentOS:
354354
For instruction how to install EPEL on RHEL, see
355355
<https://fedoraproject.org/wiki/EPEL/FAQ>.
356356

357-
After prerequisites are installed and Linux tools are in the `PATH`, do:
357+
First stage of GCC build should be disabled, because libraries will be built
358+
with the Linux host toolchain.
358359

360+
After prerequisites are installed do:
361+
362+
$ export PATH=$LINUX_HOST_TOOLS_PATH/bin:$PATH
359363
$ ./build-all.sh --no-uclibc --host i686-w64-mingw32 \
360-
--no-system-expat
364+
--no-system-expat --no-elf32-gcc-stage1
361365

362366
Note that value of host triplet depends on what mingw toolchain is being used.
363367
Triplet `i686-w64-mingw32` is valid for mingw toolchain currently used in

release.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ ECLIPSE_VERSION := mars-1
266266
ECLIPSE_VANILLA_WIN_ZIP := eclipse-cpp-$(ECLIPSE_VERSION)-win32.zip
267267
ECLIPSE_VANILLA_LINUX_TGZ := eclipse-cpp-$(ECLIPSE_VERSION)-linux-gtk-x86_64.tar.gz
268268
# Coma separated list
269-
ECLIPSE_REPO := http://download.eclipse.org/releases/mars
269+
# Synopsys IT blocks some of the Eclipse mirrors, so an exact mirror is
270+
# specified - the one which is not blocked.
271+
ECLIPSE_REPO := http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/releases/mars
270272
# Coma separated list
271273
ECLIPSE_PREREQ := org.eclipse.tm.terminal.control,org.eclipse.tm.terminal.connector.serial,org.eclipse.tm.terminal.view.core,org.eclipse.tm.terminal.view.ui
272274
ECLIPSE_DL_LINK_BASE := http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/1
@@ -775,7 +777,7 @@ $O/.stamp_ide_linux_tar: \
775777
$(LOCAL_CP) $O/$(TOOLS_ELFBE_HOST_DIR)/* $O/$(IDE_LINUX_INSTALL)
776778
$(LOCAL_CP) $O/$(TOOLS_LINUXLE_HS_HOST_DIR)/* $O/$(IDE_LINUX_INSTALL)
777779
$(LOCAL_CP) $O/$(TOOLS_LINUXBE_HS_HOST_DIR)/* $O/$(IDE_LINUX_INSTALL)
778-
mkdir -m775 $O/$(IDE_LINUX_INSTALL)/eclipse/jre
780+
mkdir -p -m775 $O/$(IDE_LINUX_INSTALL)/eclipse/jre
779781
tar xf $O/$(JRE_LINUX_TGZ) -C $O/$(IDE_LINUX_INSTALL)/eclipse/jre \
780782
--strip-components=1
781783
$(LOCAL_CP) $O/$(OOCD_HOST_DIR)/* $O/$(IDE_LINUX_INSTALL)

windows-installer/build-installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
# Params
2323
# Eclipse parameters copied from Makefile.release
24-
ECLIPSE_REPO=http://download.eclipse.org/releases/mars
24+
ECLIPSE_REPO=http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/releases/mars
2525
ECLIPSE_PREREQ=org.eclipse.tm.terminal.feature.feature.group
2626

2727
if [ -z "$RELEASE_TAG" ]; then

0 commit comments

Comments
 (0)