diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-17 20:11:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-17 20:11:26 (GMT) |
| commit | 4ce715f36aa76db649754d59c735144551d9aac5 (patch) | |
| tree | a4adc4bf1b27d4bf68d1a4cad60537c7cdbc6ebf /.github | |
| parent | 2d7572997675b69cd32554859f3ac191c00068f7 (diff) | |
| parent | bdad96ab6988802901289f1b4d1f366a2002f023 (diff) | |
| download | tcl-4ce715f36aa76db649754d59c735144551d9aac5.zip tcl-4ce715f36aa76db649754d59c735144551d9aac5.tar.gz tcl-4ce715f36aa76db649754d59c735144551d9aac5.tar.bz2 | |
Merge 8.7
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/mac-build.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/onefiledist.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 1ec784a..a9345a1 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -19,7 +19,7 @@ jobs: - name: Build run: make all env: - CFLAGS: -arch x86_64 -arch arm64e + CFLAGS: -arch x86_64 -arch arm64 - name: Run Tests run: make test styles=develop env: @@ -51,13 +51,13 @@ jobs: # Note that macOS is always a 64 bit platform run: ./configure --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1) env: - CFLAGS: -arch x86_64 -arch arm64e + CFLAGS: -arch x86_64 -arch arm64 CFGOPT: ${{ matrix.cfgopt }} - name: Build run: | make all tcltest env: - CFLAGS: -arch x86_64 -arch arm64e + CFLAGS: -arch x86_64 -arch arm64 - name: Run Tests run: | make test diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 45ce720..1f75762 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -62,7 +62,7 @@ jobs: sudo chmod a+x /usr/local/bin/macher echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV - echo "CFLAGS=-arch x86_64 -arch arm64e" >> $GITHUB_ENV + echo "CFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV - name: Configure run: ./configure --disable-symbols --disable-shared --enable-zipfs working-directory: unix |