diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-10 07:29:08 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-10 07:29:08 (GMT) |
| commit | cbbc8d66b85371d63ec183c6712ae6c769ab9403 (patch) | |
| tree | 622a92f5146c5468c67fd0ef3b1b49bb9a5401c5 | |
| parent | 155f409a383ca0411146efb82246e52ec12270fe (diff) | |
| download | tcl-cbbc8d66b85371d63ec183c6712ae6c769ab9403.zip tcl-cbbc8d66b85371d63ec183c6712ae6c769ab9403.tar.gz tcl-cbbc8d66b85371d63ec183c6712ae6c769ab9403.tar.bz2 | |
Make the macosx build able to succeed
| -rw-r--r-- | macosx/GNUmakefile | 6 | ||||
| -rw-r--r-- | tests/unixInit.test | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 54eea8e..a1b7040 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -180,8 +180,10 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) # Deployment build can be installed on top # of Development build without overwriting # the debug library - @cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \ - ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug" + @if [ -d "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" ]; then \ + cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}"; \ + ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"; \ + fi endif clean-${PROJECT}: %-${PROJECT}: diff --git a/tests/unixInit.test b/tests/unixInit.test index 05338ed..d0f83f3 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -336,8 +336,7 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints { return $enc } -cleanup { unset -nocomplain env(LANG) -} -match regexp -result [expr { - ($tcl_platform(os) eq "Darwin") ? "^utf-8$" : "^iso8859-15?$"}] +} -match regexp -result {^(iso8859-15?|utf-8)$} test unixInit-3.2 {TclpSetInitialEncodings} -setup { catch {set oldlc_all $env(LC_ALL)} } -constraints {unix stdio} -body { |