urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 11:09:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misc-porting-bugs'

Browse Source 
Fix miscellaneous bugs caught during porting-to-OSes effort
This commit is contained in:
Raymond Pasco 2016-08-30 20:16:20 -04:00
commit 36e3e23306
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -55,12 +55,12 @@ ifneq ($(UNAME),FreeBSD)
CC=gcc
CXX=g++
CXXFLAGS=$(CFLAGS)
CLD=g++ -O3 -L/usr/local/lib $(OPTLOCALLIB) $(OPENSSLLIB)
CLD=g++ $(CFLAGS) -L/usr/local/lib $(OPTLOCALLIB) $(OPENSSLLIB)
else
CC=cc
CXX=c++
CXXFLAGS=$(CFLAGS)
CLD=c++ -O3 -L/usr/local/lib $(OPTLOCALLIB) $(OPENSSLLIB)
CLD=c++ $(CFLAGS) -L/usr/local/lib $(OPTLOCALLIB) $(OPENSSLLIB)
endif
ifeq ($(OS),osx)
@ -88,9 +88,9 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN)
DEBUG=no
ifeq ($(DEBUG),yes)
DEBUGFLAGS=-g
CFLAGS=-g
else
DEBUGFLAGS=-O3
CFLAGS?=-O3
endif
# libuv version
@ -106,7 +106,7 @@ endif
# NOTFORCHECKIN - restore -O3
# -DGHETTO \
# -DHUSH
CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -ffast-math \
CFLAGS+= $(COSFLAGS) -ffast-math \
-funsigned-char \
-I/usr/local/include \
$(OPTLOCALINC) \

6
vere/sist.c
View File

@ -1172,12 +1172,6 @@ u3_sist_boot(void)
u3_noun pig = u3_none;
if ( 0 == u3_Host.ops_u.imp_c ) {
c3_c get_c[2049];
snprintf(get_c, 2048, "%s/.urb/get", u3_Host.dir_c);
if ( 0 == access(get_c, 0) ) {
uL(fprintf(uH, "pier: already built\n"));
u3_lo_bail();
}
u3_noun ten = _sist_zen();
uL(fprintf(uH, "generating 2048-bit RSA pair...\n"));