diff --git a/.github/travis_build.sh b/.github/travis_build.sh index d6206424..6b2fae8a 100644 --- a/.github/travis_build.sh +++ b/.github/travis_build.sh @@ -129,7 +129,6 @@ fi export UPX_UCLDIR="$ucl_SRCDIR" cd / && cd $upx_BUILDDIR || exit 1 make="make -f $upx_SRCDIR/src/Makefile" -EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DUCL_NO_ASM" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$ucl_BUILDDIR/src/.libs" if [[ $BUILD_LOCAL_ZLIB == 1 ]]; then EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -I$zlib_SRCDIR" @@ -143,7 +142,6 @@ if [[ $BM_B =~ (^|\+)debug($|\+) ]]; then make="$make BUILD_TYPE_DEBUG=1" fi if [[ $BM_B =~ (^|\+)sanitize($|\+) ]]; then - case $TRAVIS_OS_NAME-$CC in linux-gcc*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fuse-ld=gold" ;; esac make="$make BUILD_TYPE_SANITIZE=1" fi if [[ $BM_B =~ (^|\+)scan-build($|\+) ]]; then diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccc450a6..8b047322 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: - { name: amd64-linux-gcc-10, os: ubuntu-20.04, C: gcc-10-m64 } - { name: i386-linux-clang-10, os: ubuntu-20.04, C: clang-10-m32 } - { name: i386-linux-gcc-10, os: ubuntu-20.04, C: gcc-10-m32 } + - { name: amd64-linux-clang-10-sanitize, os: ubuntu-20.04, C: clang-10-m64, B: sanitize } + - { name: amd64-linux-gcc-10-sanitize, os: ubuntu-20.04, C: gcc-10-m64, B: sanitize } steps: - name: 'Install extra packages'