WIP try to fix LLVM 11

Author: aykevl

.circleci/config.yml

@@ -392,10 +392,10 @@ workflows:
   test-all:
     jobs:
       - test-llvm9-go111
-      - test-llvm10-go112
-      - test-llvm10-go113
-      - test-llvm10-go114
-      - test-llvm11-go115
-      - build-linux
-      - build-macos
-      - assert-test-linux
+      #- test-llvm10-go112
+      #- test-llvm10-go113
+      #- test-llvm10-go114
+      #- test-llvm11-go115
+      #- build-linux
+      #- build-macos
+      #- assert-test-linux

Makefile

@@ -48,7 +48,7 @@ ifeq ($(OS),Windows_NT)
     # LLVM compiled using MinGW on Windows appears to have problems with threads.
     # Without this flag, linking results in errors like these:
     #     libLLVMSupport.a(Threading.cpp.obj):Threading.cpp:(.text+0x55): undefined reference to `std::thread::hardware_concurrency()'
-    LLVM_OPTION += -DLLVM_ENABLE_THREADS=OFF
+    LLVM_OPTION += -DLLVM_ENABLE_THREADS=OFF -DLIBCLANG_BUILD_STATIC=ON
 
     CGO_LDFLAGS += -static -static-libgcc -static-libstdc++
     CGO_LDFLAGS_EXTRA += -lversion
@@ -57,6 +57,7 @@ ifeq ($(OS),Windows_NT)
     # doesn't allow building libclang as a static library.
     LIBCLANG_PATH = $(abspath build/libclang-custom.a)
     LIBCLANG_FILES = $(abspath $(wildcard $(LLVM_BUILDDIR)/tools/clang/tools/libclang/CMakeFiles/libclang.dir/*.cpp.obj))
+    #LIBCLANG_PATH = $(abspath $(LLVM_BUILDDIR))/lib/liblibclang.dll.a
 
     # Add the libclang dependency to the tinygo binary target.
 tinygo: $(LIBCLANG_PATH)

azure-pipelines.yml

@@ -32,7 +32,7 @@ jobs:
     - task: CacheBeta@0
       displayName: Cache LLVM build
       inputs:
-        key: llvm-build-11-windows-v1
+        key: llvm-build-11-windows-v2
         path: llvm-build
     - task: Bash@3
       displayName: Build LLVM
@@ -48,11 +48,11 @@ jobs:
             # build!
             make llvm-build
           fi
-    - task: Bash@3
-      displayName: Install QEMU
-      inputs:
-        targetType: inline
-        script: choco install qemu --version=2020.06.12
+    #- task: Bash@3
+    #  displayName: Install QEMU
+    #  inputs:
+    #    targetType: inline
+    #    script: choco install qemu --version=2020.06.12
     - task: CacheBeta@0
       displayName: Cache wasi-libc sysroot
       inputs:
@@ -63,21 +63,17 @@ jobs:
       inputs:
         targetType: inline
         script: PATH=/usr/bin:$PATH make wasi-libc
-    - task: Bash@3
-      displayName: Test TinyGo
-      inputs:
-        targetType: inline
-        script: |
-          export PATH="$PATH:./llvm-build/bin:/c/Program Files/qemu"
-          unset GOROOT
-          make test
     - task: Bash@3
       displayName: Build TinyGo release tarball
       inputs:
         targetType: inline
         script: |
           export PATH="$PATH:./llvm-build/bin:/c/Program Files/qemu"
           unset GOROOT
+          grep -r clang_Type_getAlignOf llvm-build
+          grep -r __imp_clang_Type_getAlignOf llvm-build
+          ls -l llvm-build/lib llvm-build/tools/clang/tools/libclang/CMakeFiles/*
+          make
           make build/release -j4
     - publish: $(System.DefaultWorkingDirectory)/build/release/tinygo
       displayName: Publish zip as artifact
@@ -90,3 +86,11 @@ jobs:
           export PATH="$PATH:./llvm-build/bin:/c/Program Files/qemu"
           unset GOROOT
           make smoketest TINYGO=build/tinygo AVR=0 XTENSA=0
+    - task: Bash@3
+      displayName: Test TinyGo
+      inputs:
+        targetType: inline
+        script: |
+          export PATH="$PATH:./llvm-build/bin:/c/Program Files/qemu"
+          unset GOROOT
+          make test