Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Don't let -O2 default override -O3

  • Loading branch information...
commit b38f44fac45fb07fd72cb6e1046e0c826f20f0ac 1 parent 56f03af
Brian White authored
7 binding.gyp
@@ -8,7 +8,12 @@
8 8 'include_dirs': [
9 9 'deps/libmagic/src',
10 10 ],
11   - 'cflags': [ '-O3' ],
  11 + 'cflags!': [ '-O2' ],
  12 + 'cflags+': [ '-O3' ],
  13 + 'cflags_cc!': [ '-O2' ],
  14 + 'cflags_cc+': [ '-O3' ],
  15 + 'cflags_c!': [ '-O2' ],
  16 + 'cflags_c+': [ '-O3' ],
12 17 'dependencies': [
13 18 'deps/libmagic/binding.gyp:libmagic',
14 19 ],
8 deps/libmagic/binding.gyp
@@ -6,7 +6,6 @@
6 6 'include_dirs': [ '.', 'src', 'pcre' ],
7 7 'dependencies': [
8 8 'pcre/binding.gyp:pcre',
9   - 'zlib/zlib.gyp:zlib',
10 9 ],
11 10 'defines': [ 'HAVE_CONFIG_H', 'HAVE_ZLIB_H', 'HAVE_LIBZ' ],
12 11 'conditions': [
@@ -41,7 +40,12 @@
41 40 ],
42 41 }],
43 42 ],
44   - 'cflags': [ '-O3' ],
  43 + 'cflags!': [ '-O2' ],
  44 + 'cflags+': [ '-O3' ],
  45 + 'cflags_cc!': [ '-O2' ],
  46 + 'cflags_cc+': [ '-O3' ],
  47 + 'cflags_c!': [ '-O2' ],
  48 + 'cflags_c+': [ '-O3' ],
45 49 'sources': [
46 50 'src/magic.c',
47 51 'src/apprentice.c',
8 deps/libmagic/pcre/binding.gyp
@@ -45,10 +45,16 @@
45 45 'pcreposix.h',
46 46 'ucp.h',
47 47 'pcre_chartables.c',
48   - # C plusplus sourcews
  48 + # C plusplus sources
49 49 'pcrecpp.cc',
50 50 'pcre_scanner.cc',
51 51 ],
  52 + 'cflags!': [ '-O2' ],
  53 + 'cflags+': [ '-O3' ],
  54 + 'cflags_cc!': [ '-O2' ],
  55 + 'cflags_cc+': [ '-O3' ],
  56 + 'cflags_c!': [ '-O2' ],
  57 + 'cflags_c+': [ '-O3' ],
52 58 'msvs_settings': {
53 59 'VCCLCompilerTool': {
54 60 'AdditionalOptions': ['/wd4018', '/wd4996'],

0 comments on commit b38f44f

Please sign in to comment.
Something went wrong with that request. Please try again.