fix emcc build output
This commit is contained in:
parent
83af05d274
commit
f945e9d848
23
makefile
23
makefile
@ -32,7 +32,7 @@ rtverifyn-singeli:
|
||||
wasi-o3:
|
||||
@${MAKE} i_singeli=0 i_t=wasi_o3 i_OUTPUT=BQN.wasm i_f="-DWASM -DWASI -DNO_MMAP -O3 -DCATCH_ERRORS=0 -D_WASI_EMULATED_MMAN --target=wasm32-wasi" i_lf="-lwasi-emulated-mman --target=wasm32-wasi -Wl,-z,stack-size=8388608 -Wl,--initial-memory=67108864" i_LD_LIBS= i_PIE= i_FFI=0 run_incremental_0
|
||||
emcc-o3:
|
||||
@${MAKE} i_singeli=0 i_t=emcc_o3 i_OUTPUT=BQN.js CC=emcc i_f='-DWASM -DEMCC -O3' i_lf='-s EXPORTED_FUNCTIONS=_main,_cbqn_runLine,_cbqn_evalSrc -s EXPORTED_RUNTIME_METHODS=ccall,cwrap -s ALLOW_MEMORY_GROWTH=1' i_FFI=0 run_incremental_0
|
||||
@${MAKE} i_singeli=0 i_t=emcc_o3 i_OUTPUT=. i_emcc=1 CC=emcc i_f='-DWASM -DEMCC -O3' i_lf='-s EXPORTED_FUNCTIONS=_main,_cbqn_runLine,_cbqn_evalSrc -s EXPORTED_RUNTIME_METHODS=ccall,cwrap -s ALLOW_MEMORY_GROWTH=1' i_FFI=0 run_incremental_0
|
||||
shared-o3:
|
||||
@${MAKE} i_OUTPUT=libcbqn.so i_SHARED=1 i_t=shared_o3 i_f="-O3" run_incremental_0
|
||||
shared-c:
|
||||
@ -51,6 +51,12 @@ i_OUTPUT := BQN
|
||||
ifneq ($(origin OUTPUT),command line)
|
||||
OUTPUT := $(i_OUTPUT)
|
||||
endif
|
||||
ifeq ($(i_emcc),1)
|
||||
OUTPUT_FOLDER := $(OUTPUT)
|
||||
OUTPUT_BIN := $(OUTPUT_FOLDER)/BQN.js
|
||||
else
|
||||
OUTPUT_BIN := $(OUTPUT)
|
||||
endif
|
||||
ifeq ($(i_SHARED),1)
|
||||
i_PIE := -shared
|
||||
SHARED_CCFLAGS := -DCBQN_SHARED
|
||||
@ -139,13 +145,13 @@ endif
|
||||
|
||||
# simple non-incremental builds
|
||||
single-o3:
|
||||
$(i_CC) $(ALL_CC_FLAGS) -O3 -o ${OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
$(i_CC) $(ALL_CC_FLAGS) -O3 -o ${OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
single-o3g:
|
||||
$(i_CC) $(ALL_CC_FLAGS) -O3 -g -o ${OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
$(i_CC) $(ALL_CC_FLAGS) -O3 -g -o ${OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
single-debug:
|
||||
$(i_CC) $(ALL_CC_FLAGS) -DDEBUG -g -o ${OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
$(i_CC) $(ALL_CC_FLAGS) -DDEBUG -g -o ${OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
single-c:
|
||||
$(i_CC) $(ALL_CC_FLAGS) -o ${OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
$(i_CC) $(ALL_CC_FLAGS) -o ${OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
||||
|
||||
# actual build
|
||||
run_incremental_0:
|
||||
@ -168,8 +174,11 @@ endif
|
||||
endif
|
||||
|
||||
run_incremental_1: ${bd}/BQN
|
||||
ifneq (${bd}/BQN,${OUTPUT})
|
||||
@cp -f ${bd}/BQN ${OUTPUT}
|
||||
ifneq (${bd}/BQN,${OUTPUT_BIN})
|
||||
ifeq ($(i_emcc),1)
|
||||
@cp -f ${bd}/BQN.wasm ${OUTPUT_FOLDER}/BQN.wasm
|
||||
endif
|
||||
@cp -f ${bd}/BQN ${OUTPUT_BIN}
|
||||
endif
|
||||
@echo ${postmsg}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user