diff options
| author | Tor Aamodt <[email protected]> | 2012-07-29 08:59:23 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:48:53 -0700 |
| commit | 24e887cb55d7d5efb039a0828ad58f546558a517 (patch) | |
| tree | 3cf88c5d2ee7bb402a3ba86979e52fe90c37d16d /Makefile | |
| parent | 376d457602ca0216904b3598293007ee0426599a (diff) | |
cleaning Tim's edits up so can work on MacOS and avoid duplicating effort done by version_detection.mk
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13573]
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -39,13 +39,12 @@ endif NVCC_PATH=$(shellwhich nvcc) ifneq ($(shell which nvcc), "") - CUDA_VERSION=$(shell nvcc --version | grep release | sed -re 's/.*release ([0-9]+\.[0-9]+).*/\1/') ifeq ($(DEBUG), 1) - export SIM_LIB_DIR=lib/$(CUDA_VERSION)/debug - export SIM_OBJ_FILES_DIR=build/$(CUDA_VERSION)/debug + export SIM_LIB_DIR=lib/$(CUDART_VERSION)/debug + export SIM_OBJ_FILES_DIR=build/$(CUDART_VERSION)/debug else - export SIM_LIB_DIR=lib/$(CUDA_VERSION)/release - export SIM_OBJ_FILES_DIR=build/$(CUDA_VERSION)/release + export SIM_LIB_DIR=lib/$(CUDART_VERSION)/release + export SIM_OBJ_FILES_DIR=build/$(CUDART_VERSION)/release endif endif @@ -94,7 +93,7 @@ no_opencl_support: @echo "Warning: gpgpu-sim is building without opencl support. Make sure NVOPENCL_LIBDIR and NVOPENCL_INCDIR are set" $(SIM_LIB_DIR)/libcudart.so: $(LIBS) cudalib - g++ $(MACOSX_BUILD_FLAGS) -shared -Wl,-soname,libcudart.so \ + g++ -shared -Wl,-soname,libcudart.so \ $(SIM_OBJ_FILES_DIR)/libcuda/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table/*.o \ @@ -107,7 +106,7 @@ $(SIM_LIB_DIR)/libcudart.so: $(LIBS) cudalib if [ ! -f $(SIM_LIB_DIR)/libcudart.so.4 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.4; fi $(SIM_LIB_DIR)/libcudart.dylib: $(LIBS) cudalib - g++ $(MACOSX_BUILD_FLAGS) -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.1,-current_version,1.1\ + g++ -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.1,-current_version,1.1\ $(SIM_OBJ_FILES_DIR)/libcuda/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table/*.o \ @@ -117,7 +116,7 @@ $(SIM_LIB_DIR)/libcudart.dylib: $(LIBS) cudalib -o $(SIM_LIB_DIR)/libcudart.dylib $(SIM_LIB_DIR)/libOpenCL.so: $(LIBS) opencllib - g++ $(MACOSX_BUILD_FLAGS) -shared -Wl,-soname,libOpenCL.so \ + g++ -shared -Wl,-soname,libOpenCL.so \ $(SIM_OBJ_FILES_DIR)/libopencl/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/*.o \ $(SIM_OBJ_FILES_DIR)/cuda-sim/decuda_pred_table/*.o \ |