Merge 96db02c995cc98779408334187584b69903b2489 into eaae212d2d1b17360754afd9432c21640f15c832

Makefile.cross-compiles: Fix softfloat flag not being honored for mipsle. (#4176 )
Preferred Toml
2025-06-17 17:18:21 +00:00 · 2024-04-23 10:43:07 +08:00 · 2024-04-22 19:50:58 +08:00 · 2024-03-28 00:22:00 +08:00
2 changed files with 2 additions and 2 deletions
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@ -18,7 +18,7 @@ app:
 		if [ "$${os}" = "linux" ] && [ "$${arch}" = "arm" ] && [ "$${extra}" != "" ] ; then \
 			flags=GOARM=$${extra}; \
 			target_suffix=$${os}_$${arch}_$${extra}; \
-		elif [ "$${os}" = "linux" ] && [ "$${arch}" = "mips" ] && [ "$${extra}" != "" ] ; then \
+		elif [ "$${os}" = "linux" ] && ([ "$${arch}" = "mips" ] || [ "$${arch}" = "mipsle" ]) && [ "$${extra}" != "" ] ; then \
 		    flags=GOMIPS=$${extra}; \
 		fi; \
 		echo "Build $${os}-$${arch}$${extra:+ ($${extra})}..."; \
--- a/cmd/frpc/sub/root.go
+++ b/cmd/frpc/sub/root.go
@ -43,7 +43,7 @@ var (
 )

 func init() {
-	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.ini", "config file of frpc")
+	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.toml", "config file of frpc")
 	rootCmd.PersistentFlags().StringVarP(&cfgDir, "config_dir", "", "", "config directory, run one frpc service for each file in config directory")
 	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frpc")
 	rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", true, "strict config parsing mode, unknown fields will cause an errors")
Author	SHA1	Message	Date
csznet	d83c0f897c	Merge 96db02c995cc98779408334187584b69903b2489 into eaae212d2d1b17360754afd9432c21640f15c832	2024-04-23 10:43:07 +08:00
ddscentral	eaae212d2d	Makefile.cross-compiles: Fix softfloat flag not being honored for mipsle. (#4176 )	2024-04-22 19:50:58 +08:00
csznet	96db02c995	Preferred Toml	2024-03-28 00:22:00 +08:00