From dd2cde445496a1f811cf938a112e87b2cba5805c Mon Sep 17 00:00:00 2001 From: "Ian A. Mason" Date: Thu, 25 Jul 2019 13:12:23 -0700 Subject: [PATCH] issue #30 (letting travis test it) --- shared/parser.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shared/parser.go b/shared/parser.go index cad57c6..eb36091 100644 --- a/shared/parser.go +++ b/shared/parser.go @@ -38,9 +38,9 @@ import ( "encoding/hex" "fmt" "path" - "path/filepath" + // issue #30: "path/filepath" "regexp" - "strings" + // issue #30: "strings" ) type parserResult struct { @@ -352,7 +352,9 @@ func getArtifactNames(pr parserResult, srcFileIndex int, hidden bool) (objBase s } else { srcFile := pr.InputFiles[srcFileIndex] var _, baseNameWithExt = path.Split(srcFile) - var baseName = strings.TrimSuffix(baseNameWithExt, filepath.Ext(baseNameWithExt)) + // issue #30: main.cpp and main.c cause conflicts. + // var baseName = strings.TrimSuffix(baseNameWithExt, filepath.Ext(baseNameWithExt)) + var baseName = baseNameWithExt bcBase = fmt.Sprintf(".%s.o.bc", baseName) if hidden { objBase = fmt.Sprintf(".%s.o", baseName)