all 'gow' are now 'g', maybe.

This commit is contained in:
Ian A. Mason 2017-06-28 06:35:52 -07:00
parent a0b1ce4dae
commit 3f40f09b98
2 changed files with 3 additions and 3 deletions

View File

@ -96,7 +96,7 @@ func attachBitcodePathToObject(bcFile, objFile string) {
// Store bitcode path to temp file // Store bitcode path to temp file
var absBcPath, _ = filepath.Abs(bcFile) var absBcPath, _ = filepath.Abs(bcFile)
tmpContent := []byte(absBcPath+"\n") tmpContent := []byte(absBcPath+"\n")
tmpFile, err := ioutil.TempFile("", "gowllvm") tmpFile, err := ioutil.TempFile("", "gllvm")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

View File

@ -167,7 +167,7 @@ func handleArchive(ea ExtractingArgs) {
var artifactFiles []string var artifactFiles []string
// Create tmp dir // Create tmp dir
tmpDirName, err := ioutil.TempDir("", "gowllvm") tmpDirName, err := ioutil.TempDir("", "gllvm")
if err != nil { if err != nil {
log.Fatal("The temporary directory in which to extract object files could not be created.") log.Fatal("The temporary directory in which to extract object files could not be created.")
} }
@ -251,7 +251,7 @@ func extractSectionDarwin(inputFile string) (contents string) {
cmd := exec.Command("otool", "-X", "-s", DARWIN_SEGMENT_NAME, DARWIN_SECTION_NAME, inputFile) cmd := exec.Command("otool", "-X", "-s", DARWIN_SEGMENT_NAME, DARWIN_SECTION_NAME, inputFile)
out, err := cmd.Output() out, err := cmd.Output()
if err != nil { if err != nil {
log.Fatal("There was an error extracting the Gowllvm section from ", inputFile, ". Make sure that the 'otool' command is installed.") log.Fatal("There was an error extracting the gllvm section from ", inputFile, ". Make sure that the 'otool' command is installed.")
} }
sectionLines := strings.Split(string(out), "\n") sectionLines := strings.Split(string(out), "\n")
regExp := regexp.MustCompile(`^(?:[0-9a-f]{8,16}\t)?([0-9a-f\s]+)$`) regExp := regexp.MustCompile(`^(?:[0-9a-f]{8,16}\t)?([0-9a-f\s]+)$`)