From patchwork Thu Oct 5 12:40:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 821746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AGtgdb9u"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y7C7M1cqLz9t2Z for ; Thu, 5 Oct 2017 23:41:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7ED1C87FA3; Thu, 5 Oct 2017 12:41:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rnv-9Bp_yk7O; Thu, 5 Oct 2017 12:41:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4CA1D87FA6; Thu, 5 Oct 2017 12:41:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0DC401C01CA for ; Thu, 5 Oct 2017 12:41:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 07A5C88D7B for ; Thu, 5 Oct 2017 12:41:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WoqKkyYy8NDJ for ; Thu, 5 Oct 2017 12:41:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id E9CD488D7A for ; Thu, 5 Oct 2017 12:41:07 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id l10so1280083wre.3 for ; Thu, 05 Oct 2017 05:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Eko0xpfCy28l9xVvlO3dih2TzI4kAs6C2wxj2RMDtXc=; b=AGtgdb9uyvgLPV/p9n+dJji65TDgO59g4MJPstl3Q8RCsnX3kOnihPWWPt2uaUHrxD MXU4DnKdWL8xlJCM1WpogePdL1R89ddwW6pDCmC9Is6eszHeX6TStQcPV1NJ2M9U+2En JXL99zr7/1Z1w6ZcPC+rLVcOnzmp4NoHg+k7HmSIxPT3gD39yzUUKr2oRjhlVQEHFWkJ nD9oTXRDJazshfF0uL4jNgXCologTmbCMIQXAm7W4q4TIBnSsqdeEOp8tQ4fQ02Y1PKQ Ho5eZ+vXBEb5yy3BMvLDAPUjJSYHX4mjmweFcNwKrPyXrG/esUVVwIRI2D+TV1ZskvQX URKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Eko0xpfCy28l9xVvlO3dih2TzI4kAs6C2wxj2RMDtXc=; b=NiARPp3YyQf+wPADadKhZUnsYB/3B0/PWR7JWRemVE/d75Q/B/3TPUmt5W00DCqVW2 7pZNnGVRZfM81lv9BC5DNdcph8vJaSDEbFXiGdb5PaEaZgbp6Kj9ZRVmlhwxmwM9qplw 0nPyIaFkShL85IoaKCaxaoYk0q8ZvVXKzDqVyCkJc6ZEQH3Q1Y9MqXKgFy4EXDmp6hZp vrdlIgbWJMkon5w0uV2udjzSpyh6nMMF0gRVPuNjelDOPAJbj6L/PfXSi1pWfgGs+P0R xjgprNuQhoZUsBvBgSW9Vav4jPb07UDT2P7sksTqBeveZoKRF4+0GnDGWx3GXHOaWY5p fFrQ== X-Gm-Message-State: AMCzsaXsc+Qe4HvZd/Wip6rW+gOAHrHJ8Sa8b1zzWcXqrf35sTNtuqlC 7gG6HhXhQ9imCavkpVkkZ1tJZii8 X-Google-Smtp-Source: AOwi7QAMGQQWpmnnv+9itJK/J6NHxPRFEW2XQ+YOKDKvMdXxblMwQN4lM3TJxXaEeH8lGJK48Ogohw== X-Received: by 10.223.182.156 with SMTP id j28mr14137662wre.46.1507207265521; Thu, 05 Oct 2017 05:41:05 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id c37sm10056896wra.73.2017.10.05.05.41.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Oct 2017 05:41:04 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Thu, 5 Oct 2017 14:40:57 +0200 Message-Id: <1507207260-26734-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [RFC 1/4] package/go: fixing crosscompilation settings X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable handling which causes CGO_ENABLED to be always 0. Furthermore, it fixes the cross compilation options for the go compiler: setting CGO_ENABLED should be done only for the target compiler not the host one. Signed-off-by: Angelo Compagnucci Reviewed-by: "Yann E. MORIN" --- package/go/go.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index 0781dff..8e510e7 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -52,7 +52,7 @@ HOST_GO_TARGET_ENV = \ # set, build in cgo support for any go programs that may need it. Note that # any target package needing cgo support must include # 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. -ifeq (BR2_TOOLCHAIN_HAS_THREADS,y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 @@ -74,8 +74,8 @@ HOST_GO_MAKE_ENV = \ GOARCH=$(GO_GOARCH) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GOOS=linux \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - CC=$(HOSTCC_NOCCACHE) + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) HOST_GO_TARGET_CC = \ CC_FOR_TARGET="$(TARGET_CC)" \ @@ -83,16 +83,18 @@ HOST_GO_TARGET_CC = \ HOST_GO_HOST_CC = \ CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \ - CXX_FOR_TARGET=$(HOSTCC_NOCCACHE) + CXX_FOR_TARGET=$(HOSTCXX_NOCCACHE) HOST_GO_TMP = $(@D)/host-go-tmp define HOST_GO_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) ./make.bash + cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) \ + CGO_ENABLED=0 ./make.bash mkdir -p $(HOST_GO_TMP) mv $(@D)/pkg/tool $(HOST_GO_TMP)/ mv $(@D)/bin/ $(HOST_GO_TMP)/ - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) ./make.bash + cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash endef define HOST_GO_INSTALL_CMDS