Skip to content

Commit

Permalink
Fix a bug in Makefiles for Linux
Browse files Browse the repository at this point in the history
Realtes to [CANAPI-83]
  • Loading branch information
mac-can committed Apr 20, 2024
1 parent 8698755 commit 629f112
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
9 changes: 4 additions & 5 deletions Utilities/can_moni/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,15 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
$(DEFINES) \
$(HEADERS)

LDFLAGS += -lpthread \
-rpath /usr/local/lib
LDFLAGS += -rpath /usr/local/lib

ifeq ($(BINARY),UNIVERSAL)
CFLAGS += -arch arm64 -arch x86_64
CXXFLAGS += -arch arm64 -arch x86_64
LDFLAGS += -arch arm64 -arch x86_64
endif

LIBRARIES =
LIBRARIES = -lpthread

CXX = clang++
CC = clang
Expand All @@ -88,9 +87,9 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
$(DEFINES) \
$(HEADERS)

LDFLAGS += -lpthread
LDFLAGS +=

LIBRARIES =
LIBRARIES = -lpthread

CXX = g++
CC = gcc
Expand Down
9 changes: 4 additions & 5 deletions Utilities/can_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,15 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
$(DEFINES) \
$(HEADERS)

LDFLAGS += -lpthread \
-rpath /usr/local/lib
LDFLAGS += -rpath /usr/local/lib

ifeq ($(BINARY),UNIVERSAL)
CFLAGS += -arch arm64 -arch x86_64
CXXFLAGS += -arch arm64 -arch x86_64
LDFLAGS += -arch arm64 -arch x86_64
endif

LIBRARIES =
LIBRARIES = -lpthread

CXX = clang++
CC = clang
Expand All @@ -88,9 +87,9 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
$(DEFINES) \
$(HEADERS)

LDFLAGS += -lpthread
LDFLAGS +=

LIBRARIES =
LIBRARIES = -lpthread

CXX = g++
CC = gcc
Expand Down

0 comments on commit 629f112

Please sign in to comment.