From owner-svn-ports-all@freebsd.org Wed Feb 20 00:50:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44D2214DFBE1; Wed, 20 Feb 2019 00:50:38 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD93B84728; Wed, 20 Feb 2019 00:50:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D1D4B25B09; Wed, 20 Feb 2019 00:50:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0oboP017592; Wed, 20 Feb 2019 00:50:37 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0obof017591; Wed, 20 Feb 2019 00:50:37 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201902200050.x1K0obof017591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 20 Feb 2019 00:50:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493401 - head/base/gcc X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/base/gcc X-SVN-Commit-Revision: 493401 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DD93B84728 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:50:38 -0000 Author: jhb (src,doc committer) Date: Wed Feb 20 00:50:37 2019 New Revision: 493401 URL: https://svnweb.freebsd.org/changeset/ports/493401 Log: Permit base/gcc to be built as a native package. - Don't require CROSS_TOOLCHAIN and CROSS_SYSROOT. - Handle building for an amd64 target which needs x86_64 in CONFIGURE_TARGET for similar reasons described in r475291. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D19129 Modified: head/base/gcc/Makefile Modified: head/base/gcc/Makefile ============================================================================== --- head/base/gcc/Makefile Wed Feb 20 00:48:36 2019 (r493400) +++ head/base/gcc/Makefile Wed Feb 20 00:50:37 2019 (r493401) @@ -21,14 +21,6 @@ COMMENT= GNU Compiler Collection LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -.if !defined(CROSS_TOOLCHAIN) -.error Please define CROSS_TOOLCHAIN before building -.endif - -.if !defined(CROSS_SYSROOT) -.error Please define CROSS_SYSROOT before building -.endif - TARGETARCH= ${ARCH:S/amd64/x86_64/} GCC_TARGET= ${TARGETARCH}-unknown-${OPSYS:tl}${OSREL} @@ -66,6 +58,12 @@ INSTALL_TARGET?= install-gcc .if ${OSVERSION} >= 1200000 CONFIGURE_ARGS+= --enable-initfini-array +.endif + +.if ${ARCH} == "amd64" +CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL} +.else +CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif .if ${ARCH} == "amd64" || ${ARCH} == "i386"