Tweaks to ssh setup and CFLAGS fix.

scripts/buildVm.sh

@@ -85,12 +85,14 @@ function buildIIgsSDK() {
 	cp -f "${PUBLIC}" ${EHOME}/.ssh/id_rsa.pub
 	cp -f "${PRIVATE}" ${EHOME}/.ssh/id_rsa
 	touch ${EHOME}/.ssh/authorized_keys
+	touch ${EHOME}/.ssh/known_hosts
 	touch ${EHOME}/.ssh/config
 	chmod go-w ${EHOME}
 	chmod 700 ${EHOME}/.ssh
 	chmod 600 ${EHOME}/.ssh/id_rsa
 	chmod 644 ${EHOME}/.ssh/id_rsa.pub
 	chmod 644 ${EHOME}/.ssh/authorized_keys
+	chmod 644 ${EHOME}/.ssh/known_hosts
 	chmod 644 ${EHOME}/.ssh/config
 
 	if [[ ! -e "${IIGS}/jfsDrive.img" ]]; then
@@ -419,42 +421,56 @@ function doBuild() {
 						setCompiler linux i386
 						TARGET="${SOURCE}/temp"
 						EXT=
+						export CFLAGS="-m32 -Wall -D_REENTRANT_"
+						export LDFLAGS="-lm -ldl -lpthread"
 						;;
 						
 					linux64)
 						setCompiler linux x86_64
 						TARGET="${SOURCE}/temp"
 						EXT=
+						export CFLAGS="-Wall -D_REENTRANT_"
+						export LDFLAGS="-lm -ldl -lpthread"
 						;;
 						
 					macosx32)
 						setCompiler macos i386
 						TARGET="${SOURCE}/temp"
 						EXT=
+						export CFLAGS="-Wall -D_THREAD_SAFE"
+						export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 						;;
 						
 					macosx64)
 						setCompiler macos x86_64
 						TARGET="${SOURCE}/temp"
 						EXT=
+						export CFLAGS="-Wall -D_THREAD_SAFE"
+						export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 						;;
 					
 					macosa64)
 						setCompiler macos arm
 						TARGET="${SOURCE}/temp"
 						EXT=
+						export CFLAGS="-Wall -D_THREAD_SAFE"
+						export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-weak_framework,CoreHaptics -Wl,-weak_framework,GameController -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 						;;
 					
 					win32)
 						setCompiler windows i386
 						TARGET="${SOURCE}/temp"
 						EXT=.exe
+						export CFLAGS="-Dmain=SDL_main -Wall -static-libgcc"
+						export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid"
 						;;
 						
 					win64)
 						setCompiler windows x86_64
 						TARGET="${SOURCE}/temp"
 						EXT=.exe
+						export CFLAGS="-Dmain=SDL_main -Wall -static-libgcc"
+						export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid"
 						;;
 						
 					*)
@@ -549,6 +565,8 @@ function doBuild() {
 							done
 							;;
 					esac
+				
+					export CFLAGS=${OLD_CFLAGS}
 					
 				fi
 					
@@ -558,9 +576,7 @@ function doBuild() {
 		trim O "${BUILD_PLATFORMS}"
 		BUILD_PLATFORMS="${O}]"
 
-	popd
+	popd	
-	
-	export CFLAGS=${OLD_CFLAGS}
 }
 
 
@@ -694,21 +710,20 @@ function setCompiler() {
 					NAME="linux-intel"
 					ARCH=i386
 					TRIPLE="x86_64-linux-gnu"
-					export CFLAGS="-m32 -Wall -D_REENTRANT_"
+					export CFLAGS="-m32"
-					export LDFLAGS="-lm -ldl -lpthread"
 					;;
 					
 				x86_64)
 					NAME="linux-intel"
 					ARCH=x86_64
 					TRIPLE="${ARCH}-linux-gnu"
-					export CFLAGS="-Wall -D_REENTRANT_"
+					export CFLAGS=
-					export LDFLAGS="-lm -ldl -lpthread"
 					;;
 					
 			esac
 			BACKEND=SDL2
 			LDFIRST=
+			export LDFLAGS=
 			export PATH=${OLD_PATH}
 			export LD_LIBRARY_PATH=
 			export CC=${TRIPLE}-gcc
@@ -721,27 +736,25 @@ function setCompiler() {
 					NAME="macos-intel"
 					ARCH=i386
 					TRIPLE="${ARCH}-apple-darwin17"
-					export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 					;;
 					
 				x86_64)
 					NAME="macos-intel"
 					ARCH=x86_64
 					TRIPLE="${ARCH}-apple-darwin17"
-					export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 					;;
 					
 				arm)
 					NAME="macos-apple"
 					ARCH=aarch64
 					TRIPLE="${ARCH}-apple-darwin20.4"
-					export LDFLAGS="-lm -liconv -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-weak_framework,CoreHaptics -Wl,-weak_framework,GameController -Wl,-framework,ForceFeedback -lobjc -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,Metal"
 					;;
 					
 			esac
 			BACKEND=SDL2
 			LDFIRST=
-			export CFLAGS="-Wall -D_THREAD_SAFE"
+			export CFLAGS=
+			export LDFLAGS=
 			export PATH=${EHOME}/cross/${NAME}/bin:${OLD_PATH}
 			export LD_LIBRARY_PATH=${EHOME}/cross/${NAME}/lib
 			export CC=${TRIPLE}-clang
@@ -769,8 +782,8 @@ function setCompiler() {
 			LDFIRST="-lmingw32"
 			export PATH=${OLD_PATH}
 			export LD_LIBRARY_PATH=
-			export CFLAGS="-Dmain=SDL_main -Wall -static-libgcc"
+			export CFLAGS=
-			export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid"
+			export LDFLAGS=
 			export CC=${TRIPLE}-gcc
 			export AR=${TRIPLE}-ar
 			;;