diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c72e79..3d075f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,9 @@ jobs: echo "CONFIGURE_ARGS=--prefix=/usr/local --disable-shared --enable-static --build=x86_64-apple-darwin --host=${{ matrix.gnu_triple }}" >> $GITHUB_ENV echo "CC=$(xcrun --find cc)" >> $GITHUB_ENV echo "CXX=$(xcrun --find c++)" >> $GITHUB_ENV + echo "CPP=$(xcrun --find cc) -E" >> $GITHUB_ENV echo "CFLAGS=-g -Os -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isysroot ${{ env.SDK }} -isystem $(pwd)/sysroot/usr/local/include" >> $GITHUB_ENV + echo "CPPFLAGS=${{ env.CFLAGS }} -Wno-error-implicit-function-declaration" echo "CXXFLAGS=-stdlib=libc++ -g -Os -isysroot ${{ env.SDK }} -arch ${{ matrix.arch }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -isystem $(pwd)/sysroot/usr/local/include" >> $GITHUB_ENV echo "LDFLAGS=-g -Wl,-dead_strip -arch ${{ matrix.arch }} -isysroot ${{ env.SDK }} -m${{ matrix.os }}-version-min=${{ matrix.minos }} -L$(pwd)/sysroot/usr/local/lib" >> $GITHUB_ENV mkdir -p $(pwd)/sysroot/usr/local/lib @@ -135,6 +137,7 @@ jobs: --enable-termcap \ --enable-pc-files \ --without-x11-rgb \ + --includedir="${{ env.PREFIX }}/include" \ --with-pkg-config-libdir="${{ env.PREFIX }}/lib/pkgconfig" \ --enable-widec \ --with-default-terminfo-dir="/usr/share/terminfo" \ @@ -459,11 +462,13 @@ jobs: --enable-pc-files \ --without-x11-rgb \ --with-pkg-config-libdir="${{ env.PREFIX }}/lib/pkgconfig" \ + --includedir="${{ env.PREFIX }}/include" \ --enable-widec \ --with-default-terminfo-dir="/usr/share/terminfo" \ --with-terminfo-dirs="/usr/share/terminfo:/lib/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo:/data/data/com.termux/files/usr/share/terminfo" \ LDFLAGS="${{ env.LDFLAGS }}" \ - PKG_CONFIG_LIBDIR="${{ env.PREFIX }}/lib/pkgconfig" + PKG_CONFIG_LIBDIR="${{ env.PREFIX }}/lib/pkgconfig" \ + STRIP=${{ env.CROSS_COMPILE }}strip gmake -j$(sysctl -n hw.ncpu) gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} cd ..