From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id AC8161B43D; Mon, 7 Jan 2019 14:39:32 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id q18so426565wrx.9; Mon, 07 Jan 2019 05:39:32 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3X9EfPTG5PDu/upr5RKLsh0JqJuh9FdqjeFePpV1Xec=; b=NH2nvmQGx0ubt2xkzSG0fA/Jt+HA9Z+kzZdHcO9GIS5KoKLF0DkpZD2hKzPXPd/sMG 4lNfFBHWs1JelnYZCS/r8mk0lk/7XaWfovjXs21YeNwxlJa32ubkUOXn/DYdd1s4c1Mk 6MCKT0yEu2xZe76MpysDDIVr0JN0m/GhhfahAShraLa5/z/vS9me5zRcZeID7gwltNIP UYI7OuGZz+5vN9KQuIV5EvFw4gToM7EYR9QeymomjhauQwR7F2wRxogEkGWPOUSkaq7Z 5seK7frywjFA1id2dzACECyxheD0GnB8ffyC8BLkLpVL61sCXTqusi+exM/opLJc0Ava 8kEw== X-Gm-Message-State: AJcUukdUm4j/9GmuJJt9bu4rJaBrx+sGqhJ70TfWgoEmUsW2k42gy+Of +OfkVHdnuavasOg5pzPTllWpD7l8BPU= X-Google-Smtp-Source: ALg8bN7EBeQBGEIz7UJVEdV92TucZcaz/dw7kssThTZKnzHWD6hXoaqSxjH7nZEahv/vhZN5sryZQw== X-Received: by 2002:a5d:60cc:: with SMTP id x12mr50030145wrt.193.1546868371828; Mon, 07 Jan 2019 05:39:31 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t12sm61064230wrr.65.2019.01.07.05.39.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Jan 2019 05:39:30 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, gavin.hu@arm.com, viktorin@rehivetech.com, jerinj@marvell.com, Luca Boccassi , stable@dpdk.org Date: Mon, 7 Jan 2019 13:39:26 +0000 Message-Id: <20190107133926.13928-1-bluca@debian.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181224125627.25690-1-bluca@debian.org> References: <20181224125627.25690-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2] build: use generic march on arm64 when using 'default' machine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2019 13:39:32 -0000 When building for generic distribution we need a stable baseline architecture, or depending on the build worker the result will vary. Force the default flags if the user explicitly sets machine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: fix typo in commit message, remove variable used only once config/arm/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index dae55d6b2..f15ef6385 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -105,7 +105,11 @@ else cmd_generic = ['generic', '', '', 'default', ''] cmd_output = cmd_generic # Set generic by default machine_args = [] # Clear previous machine args - if not meson.is_cross_build() + if machine == 'default' and not meson.is_cross_build() + machine = impl_generic + cmd_output = cmd_generic + impl_pn = 'default' + elif not meson.is_cross_build() # The script returns ['Implementer', 'Variant', 'Architecture', # 'Primary Part number', 'Revision'] detect_vendor = find_program(join_paths( -- 2.20.1