Skip to content
Snippets Groups Projects
Commit feb9f8ea authored by Matthew McGill's avatar Matthew McGill
Browse files

Merge branch 'thanos_support' into 'master' 

Thanos support

See merge request allzp/zipr!14
parents fe312c08 37c92219
No related branches found
No related tags found
1 merge request!14Thanos support
Pipeline #407 failed
Stage: clean
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
SConstruct
+ 2
− 0
View file @ feb9f8ea
...@@ -21,6 +21,8 @@ env.Replace(debug=ARGUMENTS.get("debug",0)) ...@@ -21,6 +21,8 @@ env.Replace(debug=ARGUMENTS.get("debug",0))
env.Replace(do_cgc=ARGUMENTS.get("do_cgc",0)) env.Replace(do_cgc=ARGUMENTS.get("do_cgc",0))
env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0)) env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0))
env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs ")
if int(env['profile']) == 1: if int(env['profile']) == 1:
print "Setting profile and debug mode" print "Setting profile and debug mode"
env.Append(CFLAGS=" -pg") env.Append(CFLAGS=" -pg")
......
src/SConscript
+ 1
− 3
View file @ feb9f8ea
...@@ -40,13 +40,11 @@ libs=''' ...@@ -40,13 +40,11 @@ libs='''
xform xform
IRDB-core IRDB-core
IRDB-cfg IRDB-cfg
BeaEngine_s_d
pqxx
transform transform
pq
dl dl
EXEIO EXEIO
StructDiv StructDiv
pqxx
''' '''
libpath=''' libpath='''
......
test/SConscript
+ 0
− 2
View file @ feb9f8ea
...@@ -48,10 +48,8 @@ libs=''' ...@@ -48,10 +48,8 @@ libs='''
xform xform
IRDB-core IRDB-core
IRDB-cfg IRDB-cfg
BeaEngine_s_d
pqxx pqxx
transform transform
pq
dl dl
EXEIO EXEIO
''' '''
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment