From e09f0d97428d1ce19db0cecb3306eb8c1375c881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Mon, 24 Nov 2025 10:58:15 +0100 Subject: [PATCH] cmpdefs: fix builds for CC [dlopen host -> no-dlopen target] (DEFCONFIG *LD-SHARED-FLAGS*) was called without a value when dlopen was not defined, that lead to error when destructuring. We put there "" instead now. --- src/cmp/cmpdefs.lsp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cmp/cmpdefs.lsp b/src/cmp/cmpdefs.lsp index 918b85f7c..2b22eb94b 100644 --- a/src/cmp/cmpdefs.lsp +++ b/src/cmp/cmpdefs.lsp @@ -52,20 +52,19 @@ coprocessor).") #+msvc "~A -Fe~S~* ~{~S ~} ~@[~S~]~{ '~A'~} ~A") (defconfig *cc-format* (cond ((member :msvc *features*) - "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}") - ((member :nacl *features*) ;; pnacl-clang doesn't support -w - "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -c \"~A\" -o \"~A\"~{ '~A'~}") - (t - "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}"))) + "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}") + ((member :nacl *features*) ;; pnacl-clang doesn't support -w + "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -c \"~A\" -o \"~A\"~{ '~A'~}") + (t + "~A -I. \"-I~A\" ~A ~:[~*~;~A~] -w -c \"~A\" -o \"~A\"~{ '~A'~}"))) (defconfig *ld-flags* "@LDFLAGS@") #-dlopen (defconfig *ld-libs* "-lecl @CORE_LIBS@ @FASL_LIBS@ @LIBS@") #+dlopen -(defconfig *ld-libs* #-msvc "-lecl @FASL_LIBS@ @LIBS@" - #+msvc "ecl.lib @CLIBS@") -(defconfig *ld-shared-flags* #+dlopen "@SHARED_LDFLAGS@ @LDFLAGS@") -(defconfig *ld-bundle-flags* #+dlopen "@BUNDLE_LDFLAGS@ @LDFLAGS@") +(defconfig *ld-libs* #-msvc "-lecl @FASL_LIBS@ @LIBS@" #+msvc "ecl.lib @CLIBS@") +(defconfig *ld-shared-flags* #+dlopen "@SHARED_LDFLAGS@ @LDFLAGS@" #-dlopen "") +(defconfig *ld-bundle-flags* #+dlopen "@BUNDLE_LDFLAGS@ @LDFLAGS@" #-dlopen "") (defconfig *ld-program-flags* "@PROGRAM_LDFLAGS@ @LDFLAGS@") (defconfig +shared-library-prefix+ "@SHAREDPREFIX@")