2355263df5
- Fix two tests that are failing on FreeBSD: one because clang aborts due
to failed assertion when trying to compile ``extern void sin(); sin();'':
Assertion failed: (Arg < NumArgs && "Arg access out of range!"),
function getArg, file
/usr/src/contrib/llvm/tools/clang/include/clang/AST/Expr.h, line 2283.
cc: error: unable to execute command: Abort trap (core dumped)
Another test (cf-check-lib) fails because of the LIBS variable which is
passed on the TEST_ENV list. Since there's nothing useful to the tests
there anyway, just ensure it is empty
PR: 234257
25 lines
1.4 KiB
Plaintext
25 lines
1.4 KiB
Plaintext
--- src/Makefile.in.orig 2018-12-20 17:50:35 UTC
|
|
+++ src/Makefile.in
|
|
@@ -267,7 +267,7 @@ test-extra$(EXEEXT) : $(LIBGAUCHE).$(SOEXT) $(test_ext
|
|
# need to relink gosh-noconsole.exe (windows no-console version).
|
|
relink :
|
|
$(RELINK) $(libgauche_LDFLAGS) $(LIBGAUCHE).$(SOEXT) $(libgauche_OBJECTS) $(libgc_pic_LIBRARY) $(GC_ATOMIC_OPS_LIBS) $(LIBS)
|
|
- $(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
|
|
+ $(RELINK) $(gosh_LDFLAGS) -o gosh-relinked$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
|
|
$(RELINK) -o gauche-config$(EXEEXT) gauche-config.$(OBJEXT) $(LIBS)
|
|
|
|
$(OBJECTS) : $(HEADERS)
|
|
@@ -542,8 +542,10 @@ install-relink : install-aux
|
|
install-core : install-relink
|
|
$(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(LIB_INSTALL_DIR)"
|
|
$(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(ARCH_INSTALL_DIR)"
|
|
- $(INSTALL) -m 555 $(INSTALL_BINS) "$(DESTDIR)$(BIN_INSTALL_DIR)"
|
|
- $(INSTALL) -m 555 $(INSTALL_BINS) "$(DESTDIR)$(ARCH_INSTALL_DIR)"
|
|
+ $(INSTALL) -m 555 $(filter-out gosh$(EXEEXT),$(INSTALL_BINS)) "$(DESTDIR)$(BIN_INSTALL_DIR)"
|
|
+ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) "$(DESTDIR)$(BIN_INSTALL_DIR)/gosh$(EXEEXT)"
|
|
+ $(INSTALL) -m 555 $(filter-out gosh$(EXEEXT),$(INSTALL_BINS)) "$(DESTDIR)$(ARCH_INSTALL_DIR)"
|
|
+ $(INSTALL) -m 555 gosh-relinked$(EXEEXT) "$(DESTDIR)$(ARCH_INSTALL_DIR)/gosh$(EXEEXT)"
|
|
@case $(host) in *-cygwin*|*-mingw*) \
|
|
$(INSTALL) $(INSTALL_LIBS) "$(DESTDIR)$(BIN_INSTALL_DIR)";;\
|
|
esac
|