NASP/cuda-samples
44
0
Fork 0
mirror of https://github.com/NVIDIA/cuda-samples.git synced 2025-04-20 20:02:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed Darwin support from Makefile as it is no longer supported by CUDA.

Browse Source
This commit is contained in:
Jason Gaiser 2023-10-20 20:17:42 +00:00
parent 8794b375de
commit fea4f3d3ee
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Samples/3_CUDA_Features/graphConditionalNodes/Makefile
View File

@ -108,7 +108,7 @@ endif
# operating system # operating system
HOST_OS := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]") HOST_OS := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
TARGET_OS ?= $(HOST_OS) TARGET_OS ?= $(HOST_OS)
ifeq (,$(filter $(TARGET_OS),linux darwin qnx android)) ifeq (,$(filter $(TARGET_OS),linux qnx android))
$(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!) $(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!)
endif endif
@ -117,11 +117,7 @@ ifdef HOST_COMPILER
CUSTOM_HOST_COMPILER = 1 CUSTOM_HOST_COMPILER = 1
endif endif
ifeq ($(TARGET_OS),darwin) ifneq ($(TARGET_ARCH),$(HOST_ARCH))
ifeq ($(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5),1)
HOST_COMPILER ?= clang++
endif
else ifneq ($(TARGET_ARCH),$(HOST_ARCH))
ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l) ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
ifeq ($(TARGET_OS),linux) ifeq ($(TARGET_OS),linux)
HOST_COMPILER ?= arm-linux-gnueabihf-g++ HOST_COMPILER ?= arm-linux-gnueabihf-g++
@ -169,10 +165,7 @@ CCFLAGS :=
LDFLAGS := LDFLAGS :=
# build flags # build flags
ifeq ($(TARGET_OS),darwin) ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
LDFLAGS += -rpath $(CUDA_PATH)/lib
CCFLAGS += -arch $(HOST_ARCH)
else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3 LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3
CCFLAGS += -mfloat-abi=hard CCFLAGS += -mfloat-abi=hard
else ifeq ($(TARGET_OS),android) else ifeq ($(TARGET_OS),android)
@ -270,12 +263,6 @@ ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS))
SAMPLE_ENABLED := 1 SAMPLE_ENABLED := 1
# This sample is not supported on Mac OSX
ifeq ($(TARGET_OS),darwin)
$(info >>> WARNING - graphMemoryNodes is not supported on Mac OSX - waiving sample <<<)
SAMPLE_ENABLED := 0
endif
ALL_LDFLAGS := ALL_LDFLAGS :=
ALL_LDFLAGS += $(ALL_CCFLAGS) ALL_LDFLAGS += $(ALL_CCFLAGS)
ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS)) ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS))