enhanced configure.ac to better support fpc wrapper's linking when findng compiler's builtin libraries such as libgcc or libquadmath
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
b86eb13fb1
commit
cac171f4b2
@ -252,6 +252,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
|
@ -249,6 +249,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
|
3
configure
vendored
3
configure
vendored
@ -662,6 +662,7 @@ ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC
|
||||
HCL_PROJECT_URL
|
||||
HCL_PROJECT_AUTHOR
|
||||
ENABLE_HCLGO_FALSE
|
||||
@ -18726,6 +18727,8 @@ HCL_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}"
|
||||
|
||||
HCL_PROJECT_URL="${PACKAGE_URL}"
|
||||
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC="$sys_lib_search_path_spec"
|
||||
|
||||
|
||||
if test `expr " $0" : " '.*"` = 0; then
|
||||
hcl_configure_cmd="'$0'"
|
||||
|
@ -674,6 +674,7 @@ AM_CONDITIONAL(ENABLE_HCLGO, test "x${enable_hclgo_is}" = "xyes")
|
||||
dnl ==== subsititution of some key items ====
|
||||
AC_SUBST(HCL_PROJECT_AUTHOR, "${PACKAGE_BUGREPORT}")
|
||||
AC_SUBST(HCL_PROJECT_URL, "${PACKAGE_URL}")
|
||||
AC_SUBST(HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC, ["$sys_lib_search_path_spec"])
|
||||
|
||||
dnl === configure arguments
|
||||
if test `expr " [$]0" : " '.*"` = 0; then
|
||||
|
@ -301,6 +301,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
|
@ -270,6 +270,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
|
@ -8,7 +8,12 @@ hcl_DEPENDENCIES = hcl.bin
|
||||
hcl_LINK = cp -pf hcl.bin $(builddir)/hcl$(EXEEXT) || echo
|
||||
|
||||
hcl.bin: $(hcl_SOURCES) ../lib/libhcl.la $(hcl_OBJECTS)
|
||||
fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 -Fl../lib -Fl../lib/.libs -Fl/usr/lib/gcc/x86_64-linux-gnu/11 $(srcdir)/main.pas
|
||||
FL='-Fl../lib:../lib/.libs'; \
|
||||
for i in @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@; do \
|
||||
FL="$${FL}:$${i}"; \
|
||||
done; \
|
||||
echo fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 "$${FL}" $(srcdir)/main.pas; \
|
||||
fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 "$${FL}" $(srcdir)/main.pas
|
||||
|
||||
clean-local:
|
||||
rm -f *.ppu *.res hcl.bin
|
||||
|
@ -201,6 +201,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
@ -621,7 +622,12 @@ uninstall-am: uninstall-binPROGRAMS
|
||||
|
||||
|
||||
hcl.bin: $(hcl_SOURCES) ../lib/libhcl.la $(hcl_OBJECTS)
|
||||
fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 -Fl../lib -Fl../lib/.libs -Fl/usr/lib/gcc/x86_64-linux-gnu/11 $(srcdir)/main.pas
|
||||
FL='-Fl../lib:../lib/.libs'; \
|
||||
for i in @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@; do \
|
||||
FL="$${FL}:$${i}"; \
|
||||
done; \
|
||||
echo fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 "$${FL}" $(srcdir)/main.pas; \
|
||||
fpc -o$(builddir)/$@ -g -Mobjfpc -FcUTF8 "$${FL}" $(srcdir)/main.pas
|
||||
|
||||
clean-local:
|
||||
rm -f *.ppu *.res hcl.bin
|
||||
|
@ -364,6 +364,7 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FILECMD = @FILECMD@
|
||||
GREP = @GREP@
|
||||
HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC = @HCL_CONFIGURE_SYS_LIB_SEARCH_PATH_SPEC@
|
||||
HCL_PROJECT_AUTHOR = @HCL_PROJECT_AUTHOR@
|
||||
HCL_PROJECT_URL = @HCL_PROJECT_URL@
|
||||
INSTALL = @INSTALL@
|
||||
|
Loading…
Reference in New Issue
Block a user