build: add arm64 macOS support

Author: MarshallOfSound

.github/workflows/CI.yml

@@ -27,10 +27,14 @@ jobs:
           node-version: ${{ matrix.node_version }}
 
       - name: Install dependencies and build
-        run: npm install
+        run: yarn
+
+      - name: Build altenative architecture
+        if: matrix.os == 'macos-latest'
+        run: MINIDUMP_BUILD_ARCH=arm64 node build.js
 
       - name: Tests
-        run: npm run test
+        run: yarn test
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2

build.js

@@ -1,9 +1,10 @@
 const fs = require('fs')
 const path = require('path')
 const childProcess = require('child_process')
+const { getEffectiveArch } = require('./lib/arch')
 
 const exe = process.platform === 'win32' ? '.exe' : ''
-const binDir = path.join(__dirname, 'bin', `${process.platform}-${process.arch}`)
+const binDir = path.join(__dirname, 'bin', `${process.platform}-${getEffectiveArch()}`)
 
 const minidumpStackwalkDest = path.join(binDir, 'minidump_stackwalk') + exe
 const minidumpDumpDest = path.join(binDir, 'minidump_dump') + exe
@@ -26,16 +27,22 @@ function spawnSync (...args) {
   }
 }
 
-const buildDir = path.join(__dirname, 'build')
+const buildDir = path.join(__dirname, 'build', getEffectiveArch())
 if (!fs.existsSync(buildDir)) {
   fs.mkdirSync(buildDir, { recursive: true })
 }
 
-spawnSync(path.join(__dirname, 'deps', 'breakpad', 'configure'), [], {
+let overrideArch = '';
+if (getEffectiveArch() !== process.arch && process.platform === 'darwin') {
+  overrideArch = getEffectiveArch() === 'arm64' ? 'arm64' : 'x86_64';
+}
+
+spawnSync(path.join(__dirname, 'deps', 'breakpad', 'configure'), ['--host=x86_64-apple-darwin20.6.0'], {
   cwd: buildDir,
   env: {
     ...process.env,
-    CPPFLAGS: `-I${path.relative(buildDir, path.join(__dirname, 'deps'))}`
+    CPPFLAGS: [`-I${path.relative(buildDir, path.join(__dirname, 'deps'))}`, ...(overrideArch ? [`-arch ${overrideArch}`] : [])].join(' '),
+    LDFLAGS: overrideArch ? `-arch ${overrideArch}` : undefined,
   },
   stdio: 'inherit'
 })
@@ -59,23 +66,33 @@ if (!fs.existsSync(binDir)) {
   fs.mkdirSync(binDir, { recursive: true })
 }
 
-const minidumpStackwalk = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_stackwalk') + exe
+const minidumpStackwalk = path.resolve(buildDir, 'src', 'processor', 'minidump_stackwalk') + exe
 fs.copyFileSync(minidumpStackwalk, minidumpStackwalkDest)
 
-const minidumpDump = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_dump') + exe
+const minidumpDump = path.resolve(buildDir, 'src', 'processor', 'minidump_dump') + exe
 fs.copyFileSync(minidumpDump, minidumpDumpDest)
 
 const dumpSyms = (() => {
   if (process.platform === 'darwin') {
     return path.resolve(__dirname, 'deps', 'breakpad', 'src', 'tools', 'mac', 'dump_syms', 'build', 'Release', 'dump_syms')
   } else if (process.platform === 'linux') {
-    return path.resolve(__dirname, 'build', 'src', 'tools', 'linux', 'dump_syms', 'dump_syms')
+    return path.resolve(buildDir, 'src', 'tools', 'linux', 'dump_syms', 'dump_syms')
   }
 })()
 fs.copyFileSync(dumpSyms, dumpSymsDest)
 
-fs.readdirSync(binDir).forEach(file => stripBin(path.join(binDir, file)))
+fs.readdirSync(binDir).forEach(file => {
+  const absFile = path.join(binDir, file)
+  stripBin(absFile)
+  maybeSignBin(absFile)
+})
 
 function stripBin (file) {
   return childProcess.execFileSync(process.env.STRIP || 'strip', [file, process.platform === 'darwin' ? '-Sx' : '--strip-all'])
 }
+
+function maybeSignBin (file) {
+  if (process.platform !== 'darwin') return
+
+  return childProcess.execFileSync('codesign', ['--sign', '-', '--force', '--preserve-metadata=entitlements,requirements,flags,runtime', file])
+}

deps/breakpad

@@ -0,0 +1,5 @@
+module.exports = {
+  getEffectiveArch: () => {
+    return process.env.MINIDUMP_BUILD_ARCH || process.arch
+  }
+}

lib/arch.js

@@ -1,10 +1,11 @@
 const fs = require('fs')
 const path = require('path')
 const spawn = require('child_process').spawn
+const { getEffectiveArch } = require('./arch')
 const format = require('./format')
 
 const exe = process.platform === 'win32' ? '.exe' : ''
-const binDir = path.join(path.dirname(__dirname), 'bin', `${process.platform}-${process.arch}`)
+const binDir = path.join(path.dirname(__dirname), 'bin', `${process.platform}-${getEffectiveArch()}`)
 
 const commands = {
   minidump_stackwalk: path.join(binDir, 'minidump_stackwalk') + exe,