Parcourir la source

[LibOS] Make test/inline build

Isaku Yamahata il y a 4 ans
Parent
commit
dabaad826d
2 fichiers modifiés avec 8 ajouts et 5 suppressions
  1. 1 1
      LibOS/shim/test/Makefile.Test
  2. 7 4
      LibOS/shim/test/inline/Makefile

+ 1 - 1
LibOS/shim/test/Makefile.Test

@@ -20,7 +20,7 @@ CFLAGS-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/..
 CXXFLAGS = -Wall -std=c++14
 CXXFLAGS-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib
 LDFLAGS	=
-LDFLAGS-debug = -L$(SHIMDIR) -L$(PALDIR) -Wl,-rpath-link=$(abspath $(RUNTIME))
+LDFLAGS-debug = -L$(SHIMDIR) -L$(PALDIR)/host/$(PAL_HOST)  -Wl,-rpath-link=$(abspath $(RUNTIME))
 
 CFLAGS-libos = -I$(SHIMDIR)/../include -L$(SHIMDIR)/../../glibc-build/libos
 

+ 7 - 4
LibOS/shim/test/inline/Makefile

@@ -13,17 +13,20 @@ include ../Makefile.Test
 
 CFLAGS-debug += -fno-builtin -nostdlib
 
+$(PALDIR)/user_start.o: $(PALDIR)/user_start.S
+	$(MAKE) -C $(PALDIR) $(notdir $@)
+
 ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux)
-LDLIBS-c_executables = $(libs) $(level)../../../Pal/src/user_start.o
+LDLIBS-c_executables = $(libs) $(PALDIR)/user_start.o
 $(c_executables): CFLAGS += $(CFLAGS-debug)
 $(c_executables): LDLIBS += $(LDFLAGS-debug) $(LDLIBS-c_executables) -lpal -lsysdb_debug
-%: %.c $(LDLIBS-c_executables)
+$(c_executables): %: %.c $(LDLIBS-c_executables)
 	$(call cmd,csingle)
 
-LDLIBS-cxx_executables = $(libs) $(level)../../../Pal/src/user_start.o
+LDLIBS-cxx_executables = $(libs) ../../../../Pal/src/user_start.o
 $(cxx_executables): CXXFLAGS += $(CFLAGS-debug)
 $(cxx_executables): LDLIBS += $(LDFLAGS-debug) $(LDLIBS-cxx_executables) -lpal -lsysdb_debug
-%: %.cpp $(LDLIBS-cxx_executables)
+$(cxx_executables): %: %.cpp $(LDLIBS-cxx_executables)
 	$(call cmd,cxxsingle)
 else
 .IGNORE: $(c_executables) $(cxx_executables)