Skip to content

Commit

Permalink
We don't need __va_copy anymore.
Browse files Browse the repository at this point in the history
  • Loading branch information
manugarg authored Jan 13, 2024
1 parent d652fe1 commit 5e6b80c
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ LIBRARY = $(LIBRARY_NAME).$(SO_SUFFIX).$(LIB_VER)
MKSHLIB = $(CC) -shared
LIB_OPTS = -Wl,-soname=$(LIBRARY) -Wl,-exclude-libs=libjs.a
SHFLAGS = -fPIC
SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=__va_copy

ifeq ($(shell test -f /etc/alpine-release && echo yes),yes)
SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=va_copy
endif

ifeq ($(OS_ARCH),FreeBSD)
PREFIX ?= /usr/local
Expand All @@ -64,13 +59,6 @@ ifeq ($(OS_ARCH),Darwin)
MKSHLIB = $(CC) -dynamiclib -framework System
LIB_OPTS = -install_name $(PREFIX)/lib/$(notdir $@)
SHFLAGS =
ifeq ($(MAC_GT_OS11),false)
MAC_MINOR_VERSION := $(shell sw_vers -productVersion | cut -d. -f2)
MAC_GT_10_5 := $(shell [ $(MAC_MINOR_VERSION) -le 5 ] && echo false)
ifeq ($(MAC_GT_10_5),false)
SMCFLAGS =
endif
endif
endif

PREFIX ?= /usr
Expand All @@ -95,11 +83,11 @@ MAN_PREFIX = $(PREFIX)/share/man
all: testpactester

jsapi_buildstamp: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jsapi
cd spidermonkey && SMCFLAGS="$(SHFLAGS)" $(MAKE) jsapi
touch jsapi_buildstamp

spidermonkey/libjs.a: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib
cd spidermonkey && SMCFLAGS="$(SHFLAGS)" $(MAKE) jslib

pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp
$(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
Expand Down

0 comments on commit 5e6b80c

Please sign in to comment.