Merge pull request #54 from thalesmg/libei-odbc-fix

fix: Change libs order to avoid picking up system libei
emqx · Jun 10, 2024 · 4cd8e6f · 4cd8e6f
2 parents 763bf63 + 1db900d
commit 4cd8e6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OTP_VERSION b/OTP_VERSION
@@ -1 +1 @@
-26.2.5-1
+26.2.5-2
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
@@ -80,10 +80,10 @@ ODBC_INCLUDE = @ODBC_INCLUDE@
 # ----------------------------------------------------
 CC =  @CC@
 CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
-EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
+EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) $(EI_LIB)
 LD = @LD@
-LDFLAGS =  $(ODBC_LIB) $(EI_LDFLAGS)
-LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
+LDFLAGS =  $(EI_LDFLAGS) $(ODBC_LIB)
+LIBS = @LIBS@ @THR_LIBS@
 INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
 TARGET_FLAGS =  @TARGET_FLAGS@