From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=T5r+i0rk; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by groups.io with SMTP; Fri, 05 Jul 2019 03:34:31 -0700 Received: by mail-wm1-f68.google.com with SMTP id z23so8826830wma.4 for ; Fri, 05 Jul 2019 03:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Gk3wwkERv+gkyWcE98tFlXpU9d58KaqDqi4G7isrJaQ=; b=T5r+i0rkO/crj9/nLrSQEGHRd+/0yVj+v8cpN8j3+eympGNOJyaxpkg1cf1rNJKI3Z wEY4KwpJiNx1R6FOWum7llIpYPfwvTC2QUb8fn3LeJgmbP/nycAkR+goSthjl5db5ys7 6e5Be0HDNXtGnNN581dMSGbk0zndcbMB6IVC8kzL+p9g/pd04DplpWjwKVSdEreUSMvY qFOLk0Owyd8LR85qZYbLccXftOyyurw9+ECf3/dvghM9e26SK/N09pqf6FEf6HkFFXad VyClecT6kuBXoGPnGgiYRdlFkNtu7hzwaPQeIPb8ZFG+Ox9TYr+85EhDOt6ZcQlmD+Lb QMew== 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=Gk3wwkERv+gkyWcE98tFlXpU9d58KaqDqi4G7isrJaQ=; b=EzlnyxE+qaNDQzyDq+eZteiSGVbOLLh68YxRFXScPFdnlM6gm49p8Ard901cidQQfa RdaIZFoAZVgVogqQxjWvd1LTEvDOV0gzzQhqcgv2w4tJaEs0SPuLJ8K/iU4kyf5mO1FK cZiSSKvy9uhDEo2XHxNUETOMkS7vOlGO71h2dI+F69avbvmGJC+SOw9TnEVPZEijmT7P +t6XyMD6ATpWtMR4SZLkDV/q/Y//PkwAlV59720mU3kmSL5FJKxadAURrbVJ7thPeM2T YfZDqlYyv7kE4HTByHNwFrXa/t9AN9cx/A06VmpV1eEUFCskFjc6y2nBjmunZGByUaHY Vveg== X-Gm-Message-State: APjAAAWOhhLqrguBP9wfVBNxJm7DwSDAG9DlzVU47v2v4QPIdXvbjNKb UhNnO4NqL+tvJsKsIRaMMi0qNsV7kK8= X-Google-Smtp-Source: APXvYqxpFKBvs759AUGu+sunzKIl9ssp0yCXh0soz4brnURjjG2Il5RYGo2JLoR1jAHrTfUmqQinRw== X-Received: by 2002:a7b:c3d5:: with SMTP id t21mr2729723wmj.87.1562322868812; Fri, 05 Jul 2019 03:34:28 -0700 (PDT) Return-Path: Received: from urvogel.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id r4sm8315271wrv.34.2019.07.05.03.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 03:34:28 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH] BaseTools: fix FCE build when edksetup not executed Date: Fri, 5 Jul 2019 11:34:26 +0100 Message-Id: <20190705103426.1423-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Commit 3c59d94637ad ("BaseTools/FCE: Add a tool FCE") added a new tool that is always built. Pre-existing tools locate the makefile includes with relative paths, but FCE uses EDK_TOOLS_PATH, adding a new dependency on having sourced edksetup.sh before building BaseTools. Change FCE GNUmakefile to match other tools. Signed-off-by: Leif Lindholm --- This broke our CI setup, so I'd appreciate if it could be merged quickly. BaseTools/Source/C/FCE/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/C/FCE/GNUmakefile b/BaseTools/Source/C/FCE/GNUmakefile index 3e1b6a85e2..7a7e1ef4b8 100644 --- a/BaseTools/Source/C/FCE/GNUmakefile +++ b/BaseTools/Source/C/FCE/GNUmakefile @@ -42,7 +42,7 @@ endif export ARCH export HOST_ARCH=$(ARCH) -MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C +MAKEROOT ?= .. APPNAME = FCE -- 2.11.0