cl: TestPython; build: PkgLinkExtern

internal/build/build.go

@@ -195,23 +195,26 @@ func buildAllPkgs(prog llssa.Program, initial []*packages.Package, mode Mode, ve
 			// skip packages that only contain declarations
 			// and set no export file
 			pkg.ExportFile = ""
-		case cl.PkgLinkIR, cl.PkgPyModule:
-			// skip packages that don't need to be compiled but need to be linked
+		case cl.PkgLinkIR, cl.PkgLinkExtern, cl.PkgPyModule:
 			pkgPath := pkg.PkgPath
 			if isPkgInLLGo(pkgPath) {
 				pkg.ExportFile = concatPkgLinkFiles(pkgPath)
 			} else {
 				panic("todo")
 			}
-		case cl.PkgLinkExtern:
-			// skip packages that don't need to be compiled but need to be linked with external library
-			linkFile := os.ExpandEnv(strings.TrimSpace(param))
-			dir, lib := filepath.Split(linkFile)
-			command := " -l " + lib
-			if dir != "" {
-				command += " -L " + dir
+			if kind == cl.PkgLinkExtern { // need to be linked with external library
+				linkFile := os.ExpandEnv(strings.TrimSpace(param))
+				dir, lib := filepath.Split(linkFile)
+				command := " -l " + lib
+				if dir != "" {
+					command += " -L " + dir
+				}
+				if isMultiLinkFiles(pkg.ExportFile) {
+					pkg.ExportFile = command + pkg.ExportFile
+				} else {
+					pkg.ExportFile = command + " " + pkg.ExportFile
+				}
 			}
-			pkg.ExportFile = command
 		default:
 			buildPkg(prog, aPkg, mode, verbose)
 			setNeedRuntimeOrPyInit(pkg, prog.NeedRuntime(), prog.NeedPyInit())

internal/pyimport/pyimport.go

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package pyimport
-
-import (
-	_ "unsafe"
-
-	"github.com/goplus/llgo/c"
-	"github.com/goplus/llgo/py"
-)
-
-const (
-	LLGoPackage = "decl"
-)
-
-/*
-func init() {
-	py.Initialize()
-	py.SetProgramName(*c.Argv)
-}
-*/
-
-//go:linkname Module C.PyImport_ImportModule
-func Module(name *c.Char) *py.Module