pass cflags to msvc before source files in command line options

Author: iliabylich

.github/workflows/release.yml

@@ -4,6 +4,10 @@ on:
     tags:
       - 'v*'
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build-lib:
     name: build lib file (target = ${{ matrix.build.target }})
@@ -61,13 +65,13 @@ jobs:
           target: ${{ matrix.build.target }}
           override: true
 
-      - name: install ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1.1"
-
-      - name: print rustc detailed version
-        run: rustc --version --verbose
+      - name: print system info
+        run: |
+          rustc --version --verbose
+          which make
+          make --version
+          which bash
+          bash --version
 
       - name: checkout
         uses: actions/checkout@v2
@@ -90,8 +94,21 @@ jobs:
           name: ${{ matrix.build.output_artifact_name }}
           path: ${{ matrix.build.output_artifact_name }}
 
+      - name: download benchmark assets
+        run: make benchmark/download
+
+      - name: build C runner
+        run: make benchmark/c-parser
+
+      # NOTE: ruby/setup-ruby breaks paths for MSVC,
+      #       and so all files must be compiled before running Ruby
+      - name: install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1.1"
+
       - name: benchmark
-        run: make benchmark/download && make benchmark/record
+        run: make benchmark/record
 
       - name: upload ${{ matrix.build.target }}.benchmark-out
         uses: actions/upload-artifact@v2

.github/workflows/test.yml

@@ -96,8 +96,13 @@ jobs:
           target: ${{ matrix.build.target }}
           override: true
 
-      - name: print rustc detailed version
-        run: rustc --version --verbose
+      - name: print system info
+        run: |
+          rustc --version --verbose
+          which make
+          make --version
+          which bash
+          bash --version
 
       - name: checkout
         uses: actions/checkout@v2

Makefile

@@ -65,9 +65,6 @@ clean:
 	rm -rf *.dSYM
 	touch codegen/build.rs
 
-check:
-	CC=$(CC) ruby assert_defs.rb bindings.h bindings.c bindings_messages.c bindings_nodes.c
-
 doxygen: messages.h nodes.h token_ids.h
 	rm -rf docs
 	doxygen

scripts/targets/x86_64-pc-windows-msvc.mk

@@ -20,11 +20,11 @@ lib.exe $(1) $(2) /OUT:$(1)
 endef
 
 define build_c_obj
-$(CC) $(1) $(CFLAGS) /c /Fo
+$(CC) /c $(CFLAGS) /Fo $(1)
 endef
 
 define build_c_exe
-$(CC) ws2_32.lib advapi32.lib userenv.lib bcrypt.lib $(1) $(CFLAGS) /link /OUT:$(2)
+$(CC) $(CFLAGS) ws2_32.lib advapi32.lib userenv.lib bcrypt.lib $(1) /link /OUT:$(2)
 endef
 
 BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-pc-windows-msvc.exe