try some static linking

This commit is contained in:
Julian Dolby 2017-06-28 17:30:55 -04:00
parent c51321f4ba
commit 6a6bf888e8
3 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@ $(C_GENERATED)/smoke_main.o: $(TEST_JNI_BRIDGE_HEADER) smoke_main.cpp
$(CC) $(ALL_FLAGS) -o $@ -c smoke_main.cpp
$(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT): $(C_GENERATED)/smoke.o
$(CC) $(CC_LDFLAGS) -Wl,-rpath -Wl,$(DOMO_AST_BIN) $(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT) $^ -o $@
$(CC) $(CC_LDFLAGS) -Wl,-rpath -Wl,$(DOMO_AST_BIN) $(DOMO_AST_BIN)$(LIBPREFIX)cast.a $^ -o $@
main: $(CAST_TEST_BIN)/smoke_main

View File

@ -30,9 +30,6 @@ import com.ibm.wala.util.io.TemporaryFile;
public class TestNativeTranslator {
static {
if (! PlatformUtil.onMacOSX()) {
System.loadLibrary("cast");
}
System.loadLibrary("xlator_test");
}

View File

@ -7,7 +7,7 @@ include Makefile.definitions
# rules
#
default: $(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT)
default: $(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT) $(DOMO_AST_BIN)$(LIBPREFIX)cast.a
bindir:
mkdir -p $(C_GENERATED)
@ -25,6 +25,9 @@ $(CAPA_OBJECTS): $(C_GENERATED)%.o: %.cpp $(CAPA_JNI_HEADERS) bindir
$(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT): $(CAPA_OBJECTS)
$(CC) $(CC_LDFLAGS) $^ -o $@
$(DOMO_AST_BIN)$(LIBPREFIX)cast.a: $(CAPA_OBJECTS)
ar -r $@ $^
clean:
rm -rf $(C_GENERATED) hs_err_pid*