gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix running tests under Windows MSVC

Browse source 
Remove -rpath flag when running tests with MSVC toolchain to fix build errors for tests as there is no rpath on Windows, and instead add object directory to PATH for Windows to find DLLs.
This commit is contained in:
Frederik Seiffert 2021-08-07 23:11:01 +02:00 committed by Frederik Seiffert
parent 865203fbab
commit 5120069a88
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Tests/GNUmakefile
View file

@ -65,9 +65,13 @@ check::
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES="$(TOP_DIR)/base.make";\
ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Source/$(GNUSTEP_TARGET_DIR)";\
ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
ADDITIONAL_LDFLAGS="-Wl,-rpath,$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
if [ "$(GNUSTEP_TARGET_OS)" = "windows" ]; then \
PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):$(TOP_DIR)/Tools/$(GNUSTEP_OBJ_DIR):${PATH}";\
else \
PATH="$(TOP_DIR)/Tools/$(GNUSTEP_OBJ_DIR):${PATH}";\
ADDITIONAL_LDFLAGS="-Wl,-rpath,$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
fi; \
LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\
PATH="$(TOP_DIR)/Tools/$(GNUSTEP_OBJ_DIR):${PATH}";\
export GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES;\
export ADDITIONAL_INCLUDE_DIRS;\
export ADDITIONAL_LDFLAGS;\