diff options
| author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-12 14:23:33 -0700 |
|---|---|---|
| committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-12 14:23:33 -0700 |
| commit | 436d22283bb91ac1b430dbc576befc18c7e9b48f (patch) | |
| tree | c2284393c463b745957ae920520a58fe75476f7f | |
| parent | f6692ff7393661171861cc4a422479db0cc37e90 (diff) | |
| download | qtlocation-mapboxgl-436d22283bb91ac1b430dbc576befc18c7e9b48f.tar.gz | |
move -fsanitize=address from binding.gyp to travis env
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | binding.gyp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2cc5b057d8..770a7f1d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ matrix: sudo: false language: node compiler: ": node4-clang35-release" - env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 ASAN_OPTIONS=detect_leaks=0 PATH=./mason_packages/linux-x86_64/node_asan/4.4.4/bin:$PATH + env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 ASAN_OPTIONS=detect_leaks=0 PATH=./mason_packages/linux-x86_64/node_asan/4.4.4/bin:$PATH CXXFLAGS="-fsanitize=address" CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" addons: *clang35 script: - make node diff --git a/binding.gyp b/binding.gyp index 1a889e8ae7..10ed677ba3 100644 --- a/binding.gyp +++ b/binding.gyp @@ -57,17 +57,12 @@ 'platform/default/jpeg_reader.cpp', ], - 'cflags': [ - '-fsanitize=address', - ], - 'cflags_cc': [ '<@(boost_cflags)', '<@(nunicode_cflags)', '<@(webp_cflags)', '<@(libpng_cflags)', '<@(libjpeg-turbo_cflags)', - '-fsanitize=address', ], 'link_settings': { @@ -80,7 +75,6 @@ '<@(libpng_static_libs)', '<@(libjpeg-turbo_ldflags)', '<@(libjpeg-turbo_static_libs)', - '-fsanitize=address', ], }, }] |