Merge pull request #4636 from michaellilltokiwa/issue/4622

do not fix fz output to UTF8 encoding
tokiwa-software · Jan 21, 2025 · 4afda11 · 4afda11
2 parents 94cf70d + 9296230
commit 4afda11
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1515,7 +1515,7 @@ lsp/compile: $(FUZION_BASE) $(CLASS_FILES_LSP)
 LSP_FUZION_HOME = fuzion/build
 LSP_JAVA_STACKSIZE=16
 LSP_DEBUGGER_SUSPENDED = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:8000
-LSP_JAVA_ARGS = -Dfuzion.home=$(LSP_FUZION_HOME) -Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 -Dsun.stderr.encoding=UTF-8 -Xss$(LSP_JAVA_STACKSIZE)m
+LSP_JAVA_ARGS = -Dfuzion.home=$(LSP_FUZION_HOME) -Dfile.encoding=UTF-8 -Xss$(LSP_JAVA_STACKSIZE)m
 lsp/debug/stdio: lsp/compile
 	$(JAVA) $(LSP_DEBUGGER_SUSPENDED) -cp  $(CLASSES_DIR):$(JARS_LSP_LSP4J):$(JARS_LSP_LSP4J_GENERATOR):$(JARS_LSP_LSP4J_JSONRPC):$(JARS_LSP_GSON):$(CLASSES_DIR_LSP) $(LSP_JAVA_ARGS) dev.flang.lsp.server.Main -stdio
 

diff --git a/bin/fz b/bin/fz
@@ -71,8 +71,6 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
   -cp "$FUZION_JAVA_CLASSPATH" \
   -Dline.separator="$LINE_SEPARATOR" \
   -Dfile.encoding=UTF-8 \
-  -Dsun.stdout.encoding=UTF-8 \
-  -Dsun.stderr.encoding=UTF-8 \
   -Dfuzion.home="$FUZION_HOME" \
   -Dfuzion.command="$FUZION_CMD" \
   dev.flang.tools.Fuzion \

diff --git a/bin/fzjava b/bin/fzjava
@@ -65,8 +65,6 @@ $FUZION_JAVA \
   -cp "$FUZION_JAVA_CLASSPATH" \
   -Dline.separator="$LINE_SEPARATOR" \
   -Dfile.encoding=UTF-8 \
-  -Dsun.stdout.encoding=UTF-8 \
-  -Dsun.stderr.encoding=UTF-8 \
   -Dfuzion.home="$FUZION_HOME" \
   -Dfuzion.command="$FUZION_CMD" \
   dev.flang.tools.fzjava.FZJava \