Skip to content

Commit 2d89891

Browse files
authored
[release-1.11] Revert "[OpenLibm_jll] Update to new build which includes patch to fix stack" (#58111)
This reverts commit 5c163fc. The patch added in that commit was necessary for the openlibm version in use at the time, but the update to openlibm 0.8.5 has since been backported. The patch now fails to apply, which breaks building openlibm with `USE_BINARYBUILDER=0`.
1 parent 760b2e5 commit 2d89891

File tree

2 files changed

+1
-77
lines changed

2 files changed

+1
-77
lines changed

deps/openlibm.mk

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ $(eval $(call git-external,openlibm,OPENLIBM,,,$(BUILDDIR)))
66

77
OPENLIBM_FLAGS := ARCH="$(ARCH)" REAL_ARCH="$(MARCH)" CC="$(CC)" FC="$(FC)" AR="$(AR)" OS="$(OS)" USECLANG=$(USECLANG) USEGCC=$(USEGCC)
88

9-
10-
$(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted/openlibm-stack-markings.patch-applied: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted
11-
mkdir -p $(dir $@)
12-
cd $(SRCCACHE)/openlibm-$(OPENLIBM_VER) && \
13-
patch -p1 -f < $(SRCDIR)/patches/openlibm-stack-markings.patch
14-
echo 1 > $@
15-
16-
$(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted/openlibm-stack-markings.patch-applied
9+
$(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted
1710
$(MAKE) -C $(dir $<) $(OPENLIBM_FLAGS) $(MAKE_COMMON)
1811
echo 1 > $@
1912

deps/patches/openlibm-stack-markings.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)