diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-26 22:21:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-26 22:21:18 (GMT) |
| commit | f7024e99c96bfd8b27099f74cf090715214fa15d (patch) | |
| tree | e6f9198c650c10e7218680bc7e7b81b64c377769 | |
| parent | 53e89dcb06d57874c1fd1aff0bca30a01f351cc0 (diff) | |
| parent | df118049469eba4e68b43e2abf902284059c0d3f (diff) | |
| download | tcl-f7024e99c96bfd8b27099f74cf090715214fa15d.zip tcl-f7024e99c96bfd8b27099f74cf090715214fa15d.tar.gz tcl-f7024e99c96bfd8b27099f74cf090715214fa15d.tar.bz2 | |
Merge 8.6. Add MacOS build using Clang++
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | generic/tclInt.decls | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 50eb658..6ab1540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,9 +139,9 @@ matrix: - BUILD_DIR=unix - CFGOPT="--enable-symbols=mem" # Testing on Mac, various styles - - name: "macOS/Xcode 11.4/Shared" + - name: "macOS/Clang/Xcode 11.5/Shared" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=macosx install: [] @@ -149,20 +149,28 @@ matrix: - make all # The styles=develop avoids some weird problems on OSX - make test styles=develop - - name: "macOS/Xcode 11.4/Shared/Unix-like" + - name: "macOS/Clang/Xcode 11.5/Shared/Unix-like" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix + - name: "macOS/Clang++/Xcode 11.5/Shared" + os: osx + osx_image: xcode11.5 + env: + - BUILD_DIR=unix + - CFGOPT="CC=clang++ --enable-framework CFLAGS=-Dregister=dont+use+register CPPFLAGS=-D__private_extern__=extern" + script: + - make all tcltest # Older MacOS versions - - name: "macOS/Xcode 11/Shared" + - name: "macOS/Clang/Xcode 11/Shared" os: osx osx_image: xcode11 env: - BUILD_DIR=macosx install: [] script: *mactest - - name: "macOS/Xcode 10/Shared" + - name: "macOS/Clang/Xcode 10/Shared" os: osx osx_image: xcode10.3 env: @@ -173,7 +181,7 @@ matrix: homebrew: packages: - libtommath - - name: "macOS/Xcode 9/Shared" + - name: "macOS/Clang/Xcode 9/Shared" os: osx osx_image: xcode9.2 env: @@ -184,7 +192,7 @@ matrix: homebrew: packages: - libtommath - - name: "macOS/Xcode 8/Shared" + - name: "macOS/Clang/Xcode 8/Shared" os: osx osx_image: xcode8.3 env: diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 948ec26..8845359 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -893,7 +893,7 @@ declare 227 { # Used to be needed for TclOO-extension; unneeded now that TclOO is in the # core and NRE-enabled # declare 228 { -# int TclObjInterpProcCore(register Tcl_Interp *interp, Tcl_Obj *procNameObj, +# int TclObjInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj, # int skip, ProcErrorProc *errorProc) # } declare 229 { |