debug windows, clean up posix (darwin), always build objconv

MacPython · Oct 31, 2023 · 400074e · 400074e
1 parent bee5763
commit 400074e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -68,17 +68,14 @@ jobs:
         python-version: 3.7
     - name: Set extra env
       run: |
-        if [ "macos-11" == "${{ matrix.os }}" ]; then
-          echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV;
-          echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
-          echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
-        else
-          echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV;
-        fi
+        # if [ "macos-11" == "${{ matrix.os }}" ]; then
+        #   echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
+        #   echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
+        # else
+        # fi
         echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;
     - name: Print some Environment variable
       run: |
-        echo "TRAVIS_OS_NAME: ${TRAVIS_OS_NAME}"
         echo "PLAT: ${PLAT}"
         echo "DOCKER_TEST_IMAGE: ${DOCKER_TEST_IMAGE}"
     - name: Install VirtualEnv
@@ -115,7 +112,7 @@ jobs:
           version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
           sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
         fi
-        if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        if [ "macos-11" == "${{ matrix.os }}" ]; then
           source tools/build_wheel.sh
         else
           libc=${MB_ML_LIBC:-manylinux}

diff --git a/tools/build_steps.sh b/tools/build_steps.sh
@@ -19,10 +19,8 @@ function before_build {
         # Deployment target set by gfortran_utils
         echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"
 
-        if [ "$INTERFACE64" = "1" ]; then
-            # Build the objconv tool
-            (cd ${ROOT_DIR}/objconv && bash ../tools/build_objconv.sh)
-        fi
+        # Build the objconv tool
+        (cd ${ROOT_DIR}/objconv && bash ../tools/build_objconv.sh)
     fi
 }
 
@@ -165,7 +163,7 @@ function do_build_lib {
     git config --global --add safe.directory '*'
     pushd OpenBLAS
     patch_source
-    CFLAGS="$CFLAGS -fvisibility=protected" \
+    CFLAGS="$CFLAGS -fvisibility=protected -Wno-maybe-uninitialized" \
     make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
         USE_OPENMP=0 NUM_THREADS=64 SYMBOLPREFIX=scipy_ \
         BINARY=$bitness $interface64_flags $target_flags > /dev/null