mirror of
https://github.com/urbit/shrub.git
synced 2024-12-18 07:42:20 +03:00
Merge branch 'clayhammer' into pending
Conflicts: urb/urbit.pill urb/zod/ape/dojo.hoon urb/zod/arvo/zuse.hoon urb/zod/lib/drum.hoon urb/zod/lib/helm.hoon urb/zod/lib/kiln.hoon Also bumped protocol to 4
This commit is contained in:
commit
5bdd1e4503
2
Makefile
2
Makefile
@ -71,7 +71,7 @@ INCLUDE=include
|
|||||||
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
|
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
|
||||||
|
|
||||||
# NOTFORCHECKIN - restore -O3
|
# NOTFORCHECKIN - restore -O3
|
||||||
# -DGHETTO
|
# -DGHETTO \
|
||||||
# -DHUSH
|
# -DHUSH
|
||||||
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
|
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
|
||||||
-funsigned-char \
|
-funsigned-char \
|
||||||
|
Loading…
Reference in New Issue
Block a user