mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: split --cflags into --cflags and --ldflags

Browse Source 
clang dislikes some cflags if given to its linker.  Unfortunately this
means some options will need to be repeated.
This commit is contained in:
Avi Kivity
2014-10-05 20:46:18 +03:00
parent 2b12c13055
commit 00fc8fb38a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.py
View File

@@ -75,6 +75,8 @@ arg_parser.add_argument('--mode', action='store', choices=list(modes.keys()) + [
arg_parser.add_argument('--with', dest='artifacts', action='append', choices=all_artifacts, default=[])
arg_parser.add_argument('--cflags', action = 'store', dest = 'user_cflags', default = '',
help = 'Extra flags for the C++ compiler')
arg_parser.add_argument('--ldflags', action = 'store', dest = 'user_ldflags', default = '',
help = 'Extra flags for the linker')
arg_parser.add_argument('--compiler', action = 'store', dest = 'cxx', default = 'g++',
help = 'C++ compiler path')
args = arg_parser.parse_args()
@@ -91,8 +93,8 @@ with open(buildfile, 'w') as f:
configure_args = {configure_args}
builddir = {outdir}
cxx = {cxx}
cxxflags = -std=gnu++1y -g -Wall -Werror -fvisibility=hidden -pthread -I. {user_cflags}
ldflags = -Wl,--no-as-needed {static}
cxxflags = -std=gnu++1y -Wall -Werror -fvisibility=hidden -pthread -I. {user_cflags}
ldflags = -Wl,--no-as-needed {static} -fvisibility=hidden -pthread {user_ldflags}
libs = {libs}
rule ragel
command = ragel -G2 -o $out $in
@@ -108,7 +110,7 @@ with open(buildfile, 'w') as f:
description = CXX $out
depfile = $out.d
rule link.{mode}
command = $cxx $cxxflags $cxxflags_{mode} $ldflags -o $out $in $libs $libs_{mode}
command = $cxx $cxxflags_{mode} $ldflags -o $out $in $libs $libs_{mode}
description = LINK $out
''').format(mode = mode, **modeval))
f.write('build {mode}: phony {artifacts}\n'.format(mode = mode,