Simplify AOT feature argument handling

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

src/hyperlight_wasm/scripts/build-wasm-examples.sh

@@ -22,39 +22,31 @@ else
     OPT_FLAGS="-O3"
 fi
 
-# Set AOT debug flags if gdb feature is enabled
-if [[ "$FEATURES" == *"gdb"* ]]; then
-    AOT_DEBUG_FLAGS="--debug"
-else
-    AOT_DEBUG_FLAGS=""
-fi
-
-# Set AOT latest flag if wasmtime_latest feature is enabled
-if [[ "$FEATURES" == *"wasmtime_latest"* ]]; then
-    AOT_VERSION_FLAGS="--wasmtime-version latest"
-else
-    AOT_VERSION_FLAGS=""
-fi
-
-AOT_FEATURES=""
+AOT_COMPILE_FLAGS=()
+AOT_FEATURES=()
 for FEATURE in ${FEATURES//,/ }; do
     case "$FEATURE" in
-        ""|wasmtime_latest|wasmtime_lts)
+        "")
+            ;;
+        gdb)
+            AOT_COMPILE_FLAGS+=(--debug)
+            AOT_FEATURES+=("$FEATURE")
+            ;;
+        wasmtime_latest)
+            AOT_COMPILE_FLAGS+=(--wasmtime-version latest)
+            ;;
+        wasmtime_lts)
             ;;
         *)
-            if [ -z "$AOT_FEATURES" ]; then
-                AOT_FEATURES="$FEATURE"
-            else
-                AOT_FEATURES="${AOT_FEATURES},${FEATURE}"
-            fi
+            AOT_FEATURES+=("$FEATURE")
             ;;
     esac
 done
 
-if [ -n "$AOT_FEATURES" ]; then
-    AOT_FEATURE_FLAGS=(--features "$AOT_FEATURES")
+if [ "${#AOT_FEATURES[@]}" -gt 0 ]; then
+    AOT_CARGO_FLAGS=(--features "$(IFS=,; echo "${AOT_FEATURES[*]}")")
 else
-    AOT_FEATURE_FLAGS=()
+    AOT_CARGO_FLAGS=()
 fi
 
 if [ -f "/.dockerenv" ] || grep -q docker /proc/1/cgroup; then
@@ -65,7 +57,7 @@ if [ -f "/.dockerenv" ] || grep -q docker /proc/1/cgroup; then
         # Build the wasm file with wasi-libc for wasmtime
         /opt/wasi-sdk/bin/clang ${DEBUG_FLAGS} -flto -ffunction-sections -mexec-model=reactor ${OPT_FLAGS} -z stack-size=4096 -Wl,--initial-memory=65536 -Wl,--export=__data_end -Wl,--export=__heap_base,--export=malloc,--export=free,--export=__wasm_call_ctors ${STRIP_FLAGS} -Wl,--no-entry -Wl,--allow-undefined -Wl,--gc-sections  -o ${OUTPUT_DIR}/${FILENAME%.*}-wasi-libc.wasm ${FILENAME}
 
-        cargo run -p hyperlight-wasm-aot "${AOT_FEATURE_FLAGS[@]}" compile ${AOT_DEBUG_FLAGS} ${AOT_VERSION_FLAGS} ${OUTPUT_DIR}/${FILENAME%.*}-wasi-libc.wasm ${OUTPUT_DIR}/${FILENAME%.*}.aot
+        cargo run -p hyperlight-wasm-aot "${AOT_CARGO_FLAGS[@]}" compile "${AOT_COMPILE_FLAGS[@]}" ${OUTPUT_DIR}/${FILENAME%.*}-wasi-libc.wasm ${OUTPUT_DIR}/${FILENAME%.*}.aot
     done
 
     for WIT_FILE in ${PWD}/components/*.wit; do
@@ -86,7 +78,7 @@ if [ -f "/.dockerenv" ] || grep -q docker /proc/1/cgroup; then
             ${PWD}/components/bindings/${COMPONENT_NAME}_component_type.o
 
         # Build AOT for Wasmtime
-        cargo run -p hyperlight-wasm-aot "${AOT_FEATURE_FLAGS[@]}" compile ${AOT_DEBUG_FLAGS} ${AOT_VERSION_FLAGS} --component ${OUTPUT_DIR}/${COMPONENT_NAME}-p2.wasm ${OUTPUT_DIR}/${COMPONENT_NAME}.aot
+        cargo run -p hyperlight-wasm-aot "${AOT_CARGO_FLAGS[@]}" compile "${AOT_COMPILE_FLAGS[@]}" --component ${OUTPUT_DIR}/${COMPONENT_NAME}-p2.wasm ${OUTPUT_DIR}/${COMPONENT_NAME}.aot
     done
 
 else 
@@ -115,7 +107,7 @@ else
             -v "${OUTPUT_DIR_REAL}:${OUTPUT_DIR_REAL}" \
             wasm-clang-builder:latest /bin/bash -c "/opt/wasi-sdk/bin/clang ${DEBUG_FLAGS} -flto -ffunction-sections -mexec-model=reactor ${OPT_FLAGS} -z stack-size=4096 -Wl,--initial-memory=65536 -Wl,--export=__data_end -Wl,--export=__heap_base,--export=malloc,--export=free,--export=__wasm_call_ctors ${STRIP_FLAGS} -Wl,--no-entry -Wl,--allow-undefined -Wl,--gc-sections  -o ${ABS_OUTPUT} ${ABS_INPUT}"
 
-        cargo run -p hyperlight-wasm-aot "${AOT_FEATURE_FLAGS[@]}" compile ${AOT_DEBUG_FLAGS} ${AOT_VERSION_FLAGS} ${OUTPUT_WASM} ${OUTPUT_DIR}/${FILENAME%.*}.aot
+        cargo run -p hyperlight-wasm-aot "${AOT_CARGO_FLAGS[@]}" compile "${AOT_COMPILE_FLAGS[@]}" ${OUTPUT_WASM} ${OUTPUT_DIR}/${FILENAME%.*}.aot
     done
 
     echo Building components
@@ -155,7 +147,7 @@ else
             ${ABS_BINDINGS_TYPE_O}"
 
         # Build AOT for Wasmtime
-        cargo run -p hyperlight-wasm-aot "${AOT_FEATURE_FLAGS[@]}" compile ${AOT_DEBUG_FLAGS} ${AOT_VERSION_FLAGS} --component ${OUTPUT_WASM} ${OUTPUT_DIR}/${COMPONENT_NAME}.aot
+        cargo run -p hyperlight-wasm-aot "${AOT_CARGO_FLAGS[@]}" compile "${AOT_COMPILE_FLAGS[@]}" --component ${OUTPUT_WASM} ${OUTPUT_DIR}/${COMPONENT_NAME}.aot
     done
 fi