patch-Makefile 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. --- quickjs-2026-06-04.orig/Makefile 2026-06-04 14:26:08.000000000 +0200
  2. +++ quickjs-2026-06-04/Makefile 2026-08-06 00:30:06.002410151 +0200
  3. @@ -43,7 +43,7 @@ endif
  4. #CONFIG_COSMO=y
  5. # installation directory
  6. -PREFIX?=/usr/local
  7. +PREFIX?=/usr
  8. # use the gprof profiler
  9. #CONFIG_PROFILE=y
  10. @@ -164,6 +164,7 @@ endif
  11. endif
  12. CFLAGS+=$(DEFINES)
  13. +HOST_CFLAGS+=$(DEFINES)
  14. CFLAGS_DEBUG=$(CFLAGS) -O0
  15. CFLAGS_SMALL=$(CFLAGS) -Os
  16. CFLAGS_OPT=$(CFLAGS) -O2
  17. @@ -287,7 +288,7 @@ ifneq ($(CROSS_PREFIX),)
  18. $(QJSC): $(OBJDIR)/qjsc.host.o \
  19. $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
  20. - $(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS)
  21. + $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(HOST_LIBS)
  22. endif #CROSS_PREFIX
  23. @@ -298,7 +299,7 @@ endif
  24. QJSC_HOST_DEFINES:=-DCONFIG_CC=\"$(HOST_CC)\" -DCONFIG_PREFIX=\"$(PREFIX)\"
  25. $(OBJDIR)/qjsc.o: CFLAGS+=$(QJSC_DEFINES)
  26. -$(OBJDIR)/qjsc.host.o: CFLAGS+=$(QJSC_HOST_DEFINES)
  27. +$(OBJDIR)/qjsc.host.o: HOST_CFLAGS+=$(QJSC_HOST_DEFINES)
  28. ifdef CONFIG_LTO
  29. LTOEXT=.lto
  30. @@ -342,7 +343,7 @@ $(OBJDIR)/fuzz_%.o: fuzz/fuzz_%.c | $(OB
  31. $(CC) $(CFLAGS_OPT) -c -I. -o $@ $<
  32. $(OBJDIR)/%.host.o: %.c | $(OBJDIR)
  33. - $(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
  34. + $(HOST_CC) $(HOST_CFLAGS) -c -o $@ $<
  35. $(OBJDIR)/%.pic.o: %.c | $(OBJDIR)
  36. $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
  37. @@ -363,7 +364,7 @@ regexp_test: libregexp.c libunicode.c cu
  38. $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
  39. unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
  40. - $(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
  41. + $(HOST_CC) $(HOST_LDFLAGS) $(HOST_CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
  42. clean:
  43. rm -f repl.c out.c