Retvrned to ninja lmao

c3lang · Jan 6, 2023 · aacfc71 · aacfc71
1 parent f6d9e32
commit aacfc71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 66 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,9 +6,7 @@ jobs:
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v1
-
-      - name: Set up Cygwin
-        uses: egor-tensin/setup-cygwin@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: Download Submodules
         run: git submodule update --init --recursive
@@ -17,7 +15,7 @@ jobs:
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
-          make -j OPT=1
+          py build.py --opt && ninja
         timeout-minutes: 10
 
       - name: upload artifacts
@@ -29,17 +27,18 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
+      - uses: seanmiddleditch/gha-setup-ninja@master
 
-      - name: Download LLVM and Make
+      - name: Download LLVM
         run: |
           brew update
-          brew install llvm@14 make
+          brew install llvm@14
 
       - name: Download Submodules
         run: git submodule update --init --recursive
 
       - name: Build TB
-        run: make -j OPT=1
+        run: py build.py --opt && ninja
         timeout-minutes: 10
 
       - name: upload artifacts
@@ -51,14 +50,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - uses: seanmiddleditch/gha-setup-ninja@master
       - name: Download LLVM
         run: sudo apt-get install llvm-11 clang-11
 
       - name: Download Submodules
         run: git submodule update --init --recursive
 
       - name: Build TB
-        run: make -j OPT=1
+        run: py build.py --opt && ninja
         timeout-minutes: 10
 
       - name: upload artifacts

diff --git a/Makefile b/Makefile
diff --git a/build.py b/build.py
@@ -35,7 +35,7 @@
 	cflags += " -DTB_USE_LUAJIT"
 
 if args.opt:
-	cflags += " -O2 -DNDEBUG"
+	cflags += " -flto -O2 -DNDEBUG"
 
 os_name = platform.system()
 if os_name == "Windows":
@@ -85,5 +85,4 @@
 ninja.write(f"build tildebackend{lib_ext}: lib {' '.join(objs)}\n")
 ninja.close()
 
-# run ninja
 exit(subprocess.call(['ninja']))