| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | --- a/Makefile |
| 2 | +++ b/Makefile |
| 3 | @@ -44,26 +44,15 @@ endif |
| 4 | include $(LIBRE_MK) |
| 5 | include mk/modules.mk |
| 6 | |
| 7 | -ifndef LIBREM_PATH |
| 8 | -LIBREM_PATH := $(shell [ -d ../rem ] && echo "../rem") |
| 9 | -endif |
| 10 | - |
| 11 | - |
| 12 | CFLAGS += -I. -Iinclude -I$(LIBRE_INC) |
| 13 | -ifneq ($(LIBREM_PATH),) |
| 14 | -CFLAGS += -I$(LIBREM_PATH)/include |
| 15 | -endif |
| 16 | -CFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT)/include/rem |
| 17 | +CFLAGS += -I$(SYSROOT_ALT)/include/rem |
| 18 | ifneq ($(SYSROOT_LOCAL),) |
| 19 | CFLAGS += -I$(SYSROOT_LOCAL)/include/rem |
| 20 | endif |
| 21 | |
| 22 | |
| 23 | CXXFLAGS += -I. -Iinclude -I$(LIBRE_INC) |
| 24 | -ifneq ($(LIBREM_PATH),) |
| 25 | -CXXFLAGS += -I$(LIBREM_PATH)/include |
| 26 | -endif |
| 27 | -CXXFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT)/include/rem |
| 28 | +CXXFLAGS += -I$(SYSROOT_ALT)/include/rem |
| 29 | ifneq ($(SYSROOT_LOCAL),) |
| 30 | CXXFLAGS += -I$(SYSROOT_LOCAL)/include/rem |
| 31 | endif |
| 32 | @@ -73,10 +62,6 @@ CXXFLAGS += $(EXTRA_CXXFLAGS) |
| 33 | # XXX: common for C/C++ |
| 34 | CPPFLAGS += -DHAVE_INTTYPES_H |
| 35 | |
| 36 | -ifneq ($(LIBREM_PATH),) |
| 37 | -CLANG_OPTIONS += -I$(LIBREM_PATH)/include |
| 38 | -endif |
| 39 | - |
| 40 | ifeq ($(OS),win32) |
| 41 | STATIC := yes |
| 42 | endif |
| 43 | @@ -144,10 +129,6 @@ LIB_OBJS := $(OBJS) $(MOD_OBJS) |
| 44 | TEST_OBJS := $(patsubst %.c,$(BUILD)/test/%.o,$(filter %.c,$(TEST_SRCS))) |
| 45 | TEST_OBJS += $(patsubst %.cpp,$(BUILD)/test/%.o,$(filter %.cpp,$(TEST_SRCS))) |
| 46 | |
| 47 | -ifneq ($(LIBREM_PATH),) |
| 48 | -LIBS += -L$(LIBREM_PATH) |
| 49 | -endif |
| 50 | - |
| 51 | # Static build: include module linker-flags in binary |
| 52 | ifneq ($(STATIC),) |
| 53 | LIBS += $(MOD_LFLAGS) |