emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'thequux/master'

Browse source 
Conflicts:
	SConstruct
This commit is contained in:
Meredith L. Patterson 2013-07-12 02:11:14 +02:00
commit a7e4def944
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -1,8 +1,8 @@
# -*- python -*-
import os
env = Environment() env = Environment()
env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes -lrt") env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes -lrt")
env['MODE'] = 'shared'
AddOption("--variant", AddOption("--variant",
dest="variant", dest="variant",
@ -24,9 +24,13 @@ if GetOption("variant") == 'debug':
env = dbg env = dbg
else: else:
env = opt env = opt
if os.getenv("CC") == "clang":
env.Replace(CC="clang",
CXX="clang++")
Export('env') Export('env')
env.SConscript(["src/SConscript"], variant_dir='build/$VARIANT/src') env.SConscript(["src/SConscript"], variant_dir='build/$VARIANT/src')
env.SConscript(["examples/SConscript"], variant_dir='build/$VARIANT/examples') env.SConscript(["examples/SConscript"], variant_dir='build/$VARIANT/examples')
env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE') env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE')

2
src/glue.h
View file

@ -182,7 +182,7 @@ HParsedToken *h_make_sint(HArena *arena, int64_t val);
HParsedToken *h_make_uint(HArena *arena, uint64_t val); HParsedToken *h_make_uint(HArena *arena, uint64_t val);
// Standard short-hands to make tokens in an action. // Standard short-hands to make tokens in an action.
#define H_MAKE(TYP, VAL) h_make(p->arena, TT_ ## TYP, VAL) #define H_MAKE(TYP, VAL) h_make(p->arena, (HTokenType)TT_ ## TYP, VAL)
#define H_MAKE_SEQ() h_make_seq(p->arena) #define H_MAKE_SEQ() h_make_seq(p->arena)
#define H_MAKE_SEQN(N) h_make_seqn(p->arena, N) #define H_MAKE_SEQN(N) h_make_seqn(p->arena, N)
#define H_MAKE_BYTES(LEN) h_make_bytes(p->arena, LEN) #define H_MAKE_BYTES(LEN) h_make_bytes(p->arena, LEN)