MAKEFILE: Move PCRE2 library path search earlier

Don't put "-L" linker options after the "-l" library. Move the search for libpcre2-8 before "-lpcre2-8" is added to OS_LDFLAGS.
open-simh · Nov 21, 2024 · f02e082 · f02e082
1 parent 770626d
commit f02e082
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/makefile b/makefile
@@ -609,11 +609,14 @@ ifeq (${WIN32},)  #*nix Environments (&& cygwin)
     PCRE2_LIB=pcre2-8
     ifneq (,$(call find_lib,${PCRE2_LIB}))
       OS_CCDEFS += -DHAVE_PCRE2_H
-      OS_LDFLAGS += -l${PCRE2_LIB}
-      $(info using libpcre2-8: $(call find_lib,${PCRE2_LIB}) $(call find_include,pcre2))
       ifeq ($(LD_SEARCH_NEEDED),$(call need_search,${PCRE2_LIB}))
-	OS_LDFLAGS += -L$(dir $(call find_lib,${{PCRE2_LIB}}))
+	PCRE2_LIBPATH = $(dir $(call find_lib,${PCRE2_LIB}))
+	ifneq (,${PCRE2_LIBPATH})
+	  OS_LDFLAGS += -L${PCRE2_LIBPATH}
+	endif
       endif
+      OS_LDFLAGS += -l${PCRE2_LIB}
+      $(info using libpcre2-8: $(call find_lib,${PCRE2_LIB}) $(call find_include,pcre2))
       FALLBACK_PCRE=
     endif
   endif