Skip to content

Commit dc1b72d

Browse files
Merge branch 'arc-dev' into arc-staging
2 parents d108518 + 8fb5065 commit dc1b72d

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

build-uclibc.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,8 +584,18 @@ then
584584
build_expat $toolchain_build_dir/_download_tmp uclibc_stage2
585585
fi
586586

587+
# See comment for "native GDB" being built later. If whole toolchain is native,
588+
# then this step is itself building a native GDB, hence same machinations with
589+
# disable-build-with-cxx are required.
590+
if [ $IS_NATIVE = yes ]; then
591+
cxx_build=--disable-build-with-cxx
592+
else
593+
cxx_build=
594+
fi
595+
587596
build_dir_init gdb
588-
configure_uclibc_stage2 gdb gdb --disable-ld --disable-gas --disable-binutils
597+
configure_uclibc_stage2 gdb gdb --disable-ld --disable-gas --disable-binutils \
598+
$cxx_build
589599
make_target building all
590600
make_target installing ${HOST_INSTALL}-gdb $stripprog_opt
591601
if [ "$DO_PDF" = "--pdf" ]

release.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,9 +969,13 @@ $(patsubst arc_gnu_$(RELEASE)_%_install,%,$(DEPLOY_BUILD_ARTIFACTS)))
969969

970970
# Create a symlink
971971
.PHONY: deploy-build
972-
deploy-build: .deploy-toolchain-build .deploy-linux-images
972+
deploy-build: .deploy-toolchain-build
973973
$(DEPLOY_BUILD_LINK_CMD)
974974

975+
ifeq ($(ENABLE_LINUX_IMAGES),y)
976+
deploy-build: .deploy-linux-images
977+
endif
978+
975979

976980
#
977981
# Upload

0 commit comments

Comments
 (0)