Merge pull request #875 from mapbox/memcpy-on-travis

Fix logic to allow binaries to run on old centos

.travis.yml

@@ -132,9 +132,10 @@ before_script:
    fi
 
 script:
+- export CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h"
 - if [[ "${NODE_VERSION}" ]]; then ./scripts/build_against_node.sh; fi;
-- nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" || true
-- nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" || true
+- nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt  || true
+- nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
 - if [[ "${NODE_VERSION}" -eq "4" ]]; then ./node_modules/.bin/eslint lib; fi;
 # disabled for now: need to port to sudo:false
 #- if [[ "${NODE_WEBKIT}" ]]; then ./scripts/build_against_node_webkit.sh; fi;

binding.gyp

@@ -31,7 +31,6 @@
         }
         ]
       ],
-      "cflags": [ "-include ../src/gcc-preinclude.h" ],
       "sources": [
         "src/database.cc",
         "src/node_sqlite3.cc",

deps/sqlite3.gyp

@@ -71,7 +71,6 @@
       'dependencies': [
         'action_before_build'
       ],
-      'cflags': [ '-include ../src/gcc-preinclude.h' ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
       ],
@@ -87,8 +86,7 @@
         ],
       },
       'cflags_cc': [
-          '-Wno-unused-value',
-          '-include ../src/gcc-preinclude.h'
+          '-Wno-unused-value'
       ],
       'defines': [
         '_REENTRANT=1',