소스 검색

[LibOS] Rename {CFLAGS, CXXFLAGS, LDFLAGS}-debug to *-libos-debug

For clarity, rename {CFLAGS, CXXFLAGS, LDFLAGS}-debug to
{CFLAGS, CXXFLAGS, LDFLAGS}-libos-debug.
Also related clean up of LibOS/shim/test/inline/Makefile.
Isaku Yamahata 4 년 전
부모
커밋
e277a05585
2개의 변경된 파일8개의 추가작업 그리고 9개의 파일을 삭제
  1. 4 3
      LibOS/shim/test/Makefile.Test
  2. 4 6
      LibOS/shim/test/inline/Makefile

+ 4 - 3
LibOS/shim/test/Makefile.Test

@@ -16,14 +16,15 @@ endif
 CC = gcc
 CXX = g++
 CFLAGS 	= -Wall -std=gnu99
-CFLAGS-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib
 CXXFLAGS = -Wall -std=c++14
-CXXFLAGS-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib
 LDFLAGS	=
-LDFLAGS-debug = -L$(SHIMDIR) -L$(PALDIR)/host/$(PAL_HOST)  -Wl,-rpath-link=$(abspath $(RUNTIME))
 
 CFLAGS-libos = -I$(SHIMDIR)/../include -L$(SHIMDIR)/../../glibc-build/libos
 
+CFLAGS-libos-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib -fno-builtin -nostdlib
+CXXFLAGS-libos-debug = -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib -fno-builtin -nostdlib
+LDFLAGS-libos-debug = -L$(SHIMDIR) -L$(PALDIR)/host/$(PAL_HOST) -Wl,-rpath-link=$(abspath $(RUNTIME)) -lpal -lsysdb_debug
+
 .PHONY: default
 default: all
 

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

@@ -11,21 +11,19 @@ include ../../../../Makefile.configs
 include ../../../../Makefile.rules
 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) $(PALDIR)/user_start.o
-$(c_executables): CFLAGS += $(CFLAGS-debug)
-$(c_executables): LDLIBS += $(LDFLAGS-debug) $(LDLIBS-c_executables) -lpal -lsysdb_debug
+$(c_executables): CFLAGS += $(CFLAGS-libos-debug)
+$(c_executables): LDLIBS += $(LDLIBS-c_executables) $(LDFLAGS-libos-debug)
 $(c_executables): %: %.c $(LDLIBS-c_executables)
 	$(call cmd,csingle)
 
 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
+$(cxx_executables): CXXFLAGS += $(CXXFLAGS-libos-debug)
+$(cxx_executables): LDLIBS += $(LDLIBS-cxx_executables) $(LDFLAGS-libos-debug)
 $(cxx_executables): %: %.cpp $(LDLIBS-cxx_executables)
 	$(call cmd,cxxsingle)
 else