brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always build quickjs, force CC and CXX on custom make deps

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-12-03 22:51:12 +00:00
parent f952e8de13
commit 039a63c384
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -91,7 +91,9 @@ carla:
STATIC_PLUGIN_TARGET=true STATIC_PLUGIN_TARGET=true
deps: deps:
ifneq ($(SYSDEPS),true) ifeq ($(SYSDEPS),true)
$(MAKE) quickjs -C deps
else
$(MAKE) all -C deps $(MAKE) all -C deps
endif endif

4
deps/Makefile vendored
View file

@ -120,6 +120,8 @@ CONFIGURE += ac_cv_host=$(TARGET_MACHINE)
DEP_MAKE = $(MAKE) DEP_MAKE = $(MAKE)
DEP_MAKE += ARCH_NAME=$(ARCH_NAME) DEP_MAKE += ARCH_NAME=$(ARCH_NAME)
DEP_MAKE += CC=$(CC)
DEP_MAKE += CXX=$(CXX)
DEP_MAKE += CFLAGS="$(BUILD_C_FLAGS)" DEP_MAKE += CFLAGS="$(BUILD_C_FLAGS)"
DEP_MAKE += CXXFLAGS="$(BUILD_CXX_FLAGS)" DEP_MAKE += CXXFLAGS="$(BUILD_CXX_FLAGS)"
DEP_MAKE += LDFLAGS="$(LINK_FLAGS)" DEP_MAKE += LDFLAGS="$(LINK_FLAGS)"
@ -238,4 +240,6 @@ clean:
rm -rf $(DEP_PATH)/zstd-1.4.5 rm -rf $(DEP_PATH)/zstd-1.4.5
rm -rf $(DEP_PATH)/QuickJS rm -rf $(DEP_PATH)/QuickJS
quickjs: $(DEP_PATH)/lib/libquickjs.a
# -------------------------------------------------------------- # --------------------------------------------------------------

2
src/Makefile.cardinal.mk
View file

@ -93,10 +93,10 @@ endif
RACK_EXTRA_LIBS = ../../plugins/plugins.a RACK_EXTRA_LIBS = ../../plugins/plugins.a
RACK_EXTRA_LIBS += ../rack.a RACK_EXTRA_LIBS += ../rack.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libquickjs.a
ifneq ($(SYSDEPS),true) ifneq ($(SYSDEPS),true)
RACK_EXTRA_LIBS += ../Rack/dep/lib/libjansson.a RACK_EXTRA_LIBS += ../Rack/dep/lib/libjansson.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libquickjs.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libsamplerate.a RACK_EXTRA_LIBS += ../Rack/dep/lib/libsamplerate.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libspeexdsp.a RACK_EXTRA_LIBS += ../Rack/dep/lib/libspeexdsp.a
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)