diff --git a/infer/models/Makefile b/infer/models/Makefile index 92c6f129f..bd302b1e1 100644 --- a/infer/models/Makefile +++ b/infer/models/Makefile @@ -10,7 +10,6 @@ C_MODELS_DIR = c/src CPP_MODELS_DIR = cpp/src JAVA_MODELS_DIR = java OBJC_MODELS_DIR = objc/src -OBJCPP_MODELS_DIR = objcpp/src RESULTS_DIR = infer-out RESULTS_DB = $(RESULTS_DIR)/results.db @@ -40,8 +39,6 @@ ifeq ($(BUILD_C_ANALYZERS),yes) $(QUIET)$(call silent_on_success,Capturing C++ models,\ $(INFER_BIN) capture $(INFER_OPTIONS) --continue -- $(MAKE) -C $(CPP_MODELS_DIR) all) ifeq (yes, $(HAS_OBJC)) - $(QUIET)$(call silent_on_success,Capturing ObjCPP models,\ - $(INFER_BIN) capture $(INFER_OPTIONS) --continue -- $(MAKE) -C $(OBJCPP_MODELS_DIR) all) $(QUIET)$(call silent_on_success,Capturing ObjC models,\ $(INFER_BIN) capture $(INFER_OPTIONS) --continue -- $(MAKE) -C $(OBJC_MODELS_DIR) all) endif @@ -87,7 +84,6 @@ ifeq ($(BUILD_C_ANALYZERS),yes) $(QUIET)$(MAKE) -C $(CPP_MODELS_DIR) clean ifeq (yes, $(HAS_OBJC)) $(QUIET)$(MAKE) -C $(OBJC_MODELS_DIR) clean - $(QUIET)$(MAKE) -C $(OBJCPP_MODELS_DIR) clean endif endif ifeq ($(BUILD_JAVA_ANALYZERS),yes) diff --git a/infer/models/objcpp/src/Makefile b/infer/models/objcpp/src/Makefile deleted file mode 100644 index 05200eafc..000000000 --- a/infer/models/objcpp/src/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -MODELS_DIR = ../.. -include $(MODELS_DIR)/models-config.make - -MM_SOURCES=$(wildcard *.mm) -M_SOURCES=$(shell find -L . -name "*.m") -C_SOURCES=$(shell find -L . -name "*.c") -OBJECTS=$(patsubst %.m,%_cxx.o, $(M_SOURCES)) $(patsubst %.c,%_cxx.o, $(C_SOURCES)) $(patsubst %.mm,%.o, $(MM_SOURCES)) -# let infer override CC by letting the shell resolve its location according to PATH -CXX=clang++ - -OBJC_TARGET = x86_64-apple-darwin14 - -CXXFLAGS += -Wno-deprecated-objc-isa-usage --target=$(OBJC_TARGET) -x objective-c++ -c -mios-simulator-version-min=8.2 -isysroot $(XCODE_ISYSROOT) - -all: $(OBJECTS) - -clean: - $(QUIET)rm -rf $(OBJECTS) - -%.o: %.mm - $(CXX) $(CXXFLAGS) $< -o $@ - -%_cxx.o: %.m - $(CXX) $(CXXFLAGS) $< -o $@ - -%_cxx.o: %.c - $(CXX) $(CXXFLAGS) $< -o $@ - -.PHONY: all clean diff --git a/infer/models/objcpp/src/objc_src b/infer/models/objcpp/src/objc_src deleted file mode 120000 index 3a162c128..000000000 --- a/infer/models/objcpp/src/objc_src +++ /dev/null @@ -1 +0,0 @@ -../../objc/src \ No newline at end of file