Chiebot-Mirror
/
meson
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix setting `-Doptimization` breaking build

Browse Source 
Closes #4206
pull/4221/head
David Seifert 7 years ago committed by Jussi Pakkanen
parent 05d1577e87
commit ce35122263
1 changed files with 19 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      mesonbuild/compilers/compilers.py

21
mesonbuild/compilers/compilers.py
Unescape View File

@ -127,19 +127,24 @@ gnulike_buildtype_args = {'plain': [],
'debug': [], 'debug': [],
'debugoptimized': [], 'debugoptimized': [],
'release': [], 'release': [],
'minsize': []} 'minsize': [],
'custom': [],
}
armclang_buildtype_args = {'plain': [], armclang_buildtype_args = {'plain': [],
'debug': ['-O0', '-g'], 'debug': ['-O0', '-g'],
'debugoptimized': ['-O1', '-g'], 'debugoptimized': ['-O1', '-g'],
'release': ['-Os'], 'release': ['-Os'],
'minsize': ['-Oz']} 'minsize': ['-Oz'],
'custom': [],
}
arm_buildtype_args = {'plain': [], arm_buildtype_args = {'plain': [],
'debug': ['-O0', '--debug'], 'debug': ['-O0', '--debug'],
'debugoptimized': ['-O1', '--debug'], 'debugoptimized': ['-O1', '--debug'],
'release': ['-O3', '-Otime'], 'release': ['-O3', '-Otime'],
'minsize': ['-O3', '-Ospace'], 'minsize': ['-O3', '-Ospace'],
'custom': [],
} }
msvc_buildtype_args = {'plain': [], msvc_buildtype_args = {'plain': [],
@ -147,6 +152,7 @@ msvc_buildtype_args = {'plain': [],
'debugoptimized': ["/Zi", "/Ob1"], 'debugoptimized': ["/Zi", "/Ob1"],
'release': ["/Ob2", "/Gw"], 'release': ["/Ob2", "/Gw"],
'minsize': ["/Zi", "/Gw"], 'minsize': ["/Zi", "/Gw"],
'custom': [],
} }
apple_buildtype_linker_args = {'plain': [], apple_buildtype_linker_args = {'plain': [],
@ -154,6 +160,7 @@ apple_buildtype_linker_args = {'plain': [],
'debugoptimized': [], 'debugoptimized': [],
'release': [], 'release': [],
'minsize': [], 'minsize': [],
'custom': [],
} }
gnulike_buildtype_linker_args = {'plain': [], gnulike_buildtype_linker_args = {'plain': [],
@ -161,6 +168,7 @@ gnulike_buildtype_linker_args = {'plain': [],
'debugoptimized': [], 'debugoptimized': [],
'release': ['-Wl,-O1'], 'release': ['-Wl,-O1'],
'minsize': [], 'minsize': [],
'custom': [],
} }
arm_buildtype_linker_args = {'plain': [], arm_buildtype_linker_args = {'plain': [],
@ -168,6 +176,7 @@ arm_buildtype_linker_args = {'plain': [],
'debugoptimized': [], 'debugoptimized': [],
'release': [], 'release': [],
'minsize': [], 'minsize': [],
'custom': [],
} }
msvc_buildtype_linker_args = {'plain': [], msvc_buildtype_linker_args = {'plain': [],
@ -178,6 +187,7 @@ msvc_buildtype_linker_args = {'plain': [],
# REF implies ICF. # REF implies ICF.
'release': ['/OPT:REF'], 'release': ['/OPT:REF'],
'minsize': ['/INCREMENTAL:NO', '/OPT:REF'], 'minsize': ['/INCREMENTAL:NO', '/OPT:REF'],
'custom': [],
} }
java_buildtype_args = {'plain': [], java_buildtype_args = {'plain': [],
@ -185,6 +195,7 @@ java_buildtype_args = {'plain': [],
'debugoptimized': ['-g'], 'debugoptimized': ['-g'],
'release': [], 'release': [],
'minsize': [], 'minsize': [],
'custom': [],
} }
rust_buildtype_args = {'plain': [], rust_buildtype_args = {'plain': [],
@ -192,6 +203,7 @@ rust_buildtype_args = {'plain': [],
'debugoptimized': [], 'debugoptimized': [],
'release': [], 'release': [],
'minsize': [], 'minsize': [],
'custom': [],
} }
d_gdc_buildtype_args = {'plain': [], d_gdc_buildtype_args = {'plain': [],
@ -199,6 +211,7 @@ d_gdc_buildtype_args = {'plain': [],
'debugoptimized': ['-finline-functions'], 'debugoptimized': ['-finline-functions'],
'release': ['-frelease', '-finline-functions'], 'release': ['-frelease', '-finline-functions'],
'minsize': [], 'minsize': [],
'custom': [],
} }
d_ldc_buildtype_args = {'plain': [], d_ldc_buildtype_args = {'plain': [],
@ -206,6 +219,7 @@ d_ldc_buildtype_args = {'plain': [],
'debugoptimized': ['-enable-inlining', '-Hkeep-all-bodies'], 'debugoptimized': ['-enable-inlining', '-Hkeep-all-bodies'],
'release': ['-release', '-enable-inlining', '-Hkeep-all-bodies'], 'release': ['-release', '-enable-inlining', '-Hkeep-all-bodies'],
'minsize': [], 'minsize': [],
'custom': [],
} }
d_dmd_buildtype_args = {'plain': [], d_dmd_buildtype_args = {'plain': [],
@ -213,6 +227,7 @@ d_dmd_buildtype_args = {'plain': [],
'debugoptimized': ['-inline'], 'debugoptimized': ['-inline'],
'release': ['-release', '-inline'], 'release': ['-release', '-inline'],
'minsize': [], 'minsize': [],
'custom': [],
} }
mono_buildtype_args = {'plain': [], mono_buildtype_args = {'plain': [],
@ -220,6 +235,7 @@ mono_buildtype_args = {'plain': [],
'debugoptimized': ['-optimize+'], 'debugoptimized': ['-optimize+'],
'release': ['-optimize+'], 'release': ['-optimize+'],
'minsize': [], 'minsize': [],
'custom': [],
} }
swift_buildtype_args = {'plain': [], swift_buildtype_args = {'plain': [],
@ -227,6 +243,7 @@ swift_buildtype_args = {'plain': [],
'debugoptimized': [], 'debugoptimized': [],
'release': [], 'release': [],
'minsize': [], 'minsize': [],
'custom': [],
} }
gnu_winlibs = ['-lkernel32', '-luser32', '-lgdi32', '-lwinspool', '-lshell32', gnu_winlibs = ['-lkernel32', '-luser32', '-lgdi32', '-lwinspool', '-lshell32',

Write Preview
Loading…
Cancel
Save