ObjFW  Diff

Differences From Artifact [751d97b23e]:

To Artifact [251ca20f5d]:


35
36
37
38
39
40
41
42
43

44
45
46
47
48
49
50
51
52
53
    - os: linux
      compiler: clang
      dist: precise
      sudo: required

    # macOS
    - os: osx
      osx_image: xcode11
      language: objective-c

    - os: osx
      osx_image: xcode10.2
      language: objective-c
    - os: osx
      osx_image: xcode10.1
      language: objective-c
    - os: osx
      osx_image: xcode10
      language: objective-c
    - os: osx







|

>
|
<
<







35
36
37
38
39
40
41
42
43
44
45


46
47
48
49
50
51
52
    - os: linux
      compiler: clang
      dist: precise
      sudo: required

    # macOS
    - os: osx
      osx_image: xcode10.2
      language: objective-c
      env:
        - no32bit=1


    - os: osx
      osx_image: xcode10.1
      language: objective-c
    - os: osx
      osx_image: xcode10
      language: objective-c
    - os: osx
232
233
234
235
236
237
238

239

240
241
242
243
244
245
246
            build_32_64 --disable-compiler-tls;
            build_32_64 --disable-compiler-tls --disable-threads;
    fi

  - if [ "$TRAVIS_OS_NAME" = "osx" -a -z "$config" ]; then
            build_mac_32_64() {
                    build $@;

                    build OBJC="clang -m32" --host=i386-apple-darwin $@;

            };

            if xcodebuild -version | grep 'Xcode 6' >/dev/null; then
                    export CPPFLAGS="-D_Nullable=__nullable
                                     -D_Nonnull=__nonnull
                                     -D_Null_unspecified=__null_unspecified";
            fi;







>
|
>







231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
            build_32_64 --disable-compiler-tls;
            build_32_64 --disable-compiler-tls --disable-threads;
    fi

  - if [ "$TRAVIS_OS_NAME" = "osx" -a -z "$config" ]; then
            build_mac_32_64() {
                    build $@;
                    if [ -z "$no32bit" ]; then
                            build OBJC="clang -m32" --host=i386-apple-darwin $@;
                    fi;
            };

            if xcodebuild -version | grep 'Xcode 6' >/dev/null; then
                    export CPPFLAGS="-D_Nullable=__nullable
                                     -D_Nonnull=__nonnull
                                     -D_Null_unspecified=__null_unspecified";
            fi;