From f9ebd6bdf811aac3286833d8d9136c2d551c1690 Mon Sep 17 00:00:00 2001 From: Martino Facchin Date: Tue, 27 Aug 2019 14:18:20 +0200 Subject: [PATCH] Check if variantFolder exists and is a folder (#359) Fixes #126 --- legacy/builder/phases/core_builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/builder/phases/core_builder.go b/legacy/builder/phases/core_builder.go index fe8285c6bf4..b72a628005b 100644 --- a/legacy/builder/phases/core_builder.go +++ b/legacy/builder/phases/core_builder.go @@ -78,7 +78,7 @@ func compileCore(ctx *types.Context, buildPath *paths.Path, buildCachePath *path includes := []string{} includes = append(includes, coreFolder.String()) - if variantFolder != nil { + if variantFolder != nil && variantFolder.IsDir() { includes = append(includes, variantFolder.String()) } includes = utils.Map(includes, utils.WrapWithHyphenI) @@ -86,7 +86,7 @@ func compileCore(ctx *types.Context, buildPath *paths.Path, buildCachePath *path var err error variantObjectFiles := paths.NewPathList() - if variantFolder != nil { + if variantFolder != nil && variantFolder.IsDir() { variantObjectFiles, err = builder_utils.CompileFiles(ctx, variantFolder, true, buildPath, buildProperties, includes) if err != nil { return nil, nil, i18n.WrapError(err)