experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two minor fixes for building on macOS, HOST_VENDOR should be defined before trying to check its value.

Browse source
This commit is contained in:
Kristofer Hallin 2022-08-17 09:39:16 +02:00
parent 971ecb1b7f
commit 6a367fa97b
No known key found for this signature in database
GPG key ID: 5A2B21943DE5C500
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/backend/Makefile.in
View file

@ -46,12 +46,6 @@ endif
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@ LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
ifneq ($(LINKAGE),dynamic) ifneq ($(LINKAGE),dynamic)
LDFLAGS += -rdynamic -L. LDFLAGS += -rdynamic -L.
@ -70,6 +64,12 @@ HOST_VENDOR = @host_vendor@
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLIXON_MINOR = @CLIXON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
# Use this clixon lib for linking # Use this clixon lib for linking
ifeq ($(LINKAGE),dynamic) ifeq ($(LINKAGE),dynamic)
CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR) CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)

12
apps/cli/Makefile.in
View file

@ -50,12 +50,6 @@ endif
SH_SUFFIX = @SH_SUFFIX@ SH_SUFFIX = @SH_SUFFIX@
LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@ LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
ifneq ($(LINKAGE),dynamic) ifneq ($(LINKAGE),dynamic)
# -rdynamic for using -ldl # -rdynamic for using -ldl
@ -77,6 +71,12 @@ HOST_VENDOR = @host_vendor@
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLIXON_MINOR = @CLIXON_VERSION_MINOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@
ifeq ($(HOST_VENDOR),apple)
INSTALLFLAGS =
else
INSTALLFLAGS = @INSTALLFLAGS@
endif
# Use this clixon lib for linking # Use this clixon lib for linking
ifeq ($(LINKAGE),dynamic) ifeq ($(LINKAGE),dynamic)
CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR) CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)