always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cc_archive

Browse Source
This commit is contained in:
lperron@google.com
2013-09-23 15:09:31 +00:00
parent 884df91751
commit db48748491
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/Makefile.cpp.mk
View File

@@ -1045,7 +1045,7 @@ $(BIN_DIR)/integer_programming$E: $(DYNAMIC_LP_DEPS) $(OBJ_DIR)/integer_programm
$(LIB_DIR)/$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX): $(CONSTRAINT_SOLVER_LIB_OBJS) $(LINEAR_SOLVER_LIB_OBJS) $(UTIL_LIB_OBJS) $(GRAPH_LIB_OBJS) $(SHORTESTPATHS_LIB_OBJS) $(ROUTING_LIB_OBJS) $(ALGORITHMS_LIB_OBJS) $(BASE_LIB_OBJS)
$(DYNAMIC_LD) \
$(DYNAMIC_LINK_CMD) \
$(LDOUT)$(LIB_DIR)$S$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX) \
$(ALGORITHMS_LIB_OBJS) \
$(BASE_LIB_OBJS) \
@@ -1088,6 +1088,7 @@ else
cp src/gen/constraint_solver/*.pb.h temp/or-tools.$(PORT)/include/constraint_solver
cp src/graph/*.h temp/or-tools.$(PORT)/include/graph
cp src/linear_solver/*.h temp/or-tools.$(PORT)/include/linear_solver
cp src/gen/linear_solver/*.pb.h temp/or-tools.$(PORT)/include/linear_solver
cp src/util/*.h temp/or-tools.$(PORT)/include/util
cd temp/or-tools.$(PORT)/include && tar -C ../../../dependencies/install/include -c -v gflags | tar xvm
cd temp/or-tools.$(PORT)/include && tar -C ../../../dependencies/install/include -c -v google | tar xvm

3
tools/Makefile.cc
View File

@@ -45,10 +45,10 @@ ifeq ("$(SYSTEM)","unix")
OR_TOOLS_TOP ?= $(shell pwd)
OR_ROOT_FULL=$(OR_TOOLS_TOP)
LD_FLAGS = -lz -lrt -lpthread
OS = $(shell uname -s)
ifeq ($(OS),Linux)
CCC = g++ -fPIC -std=c++0x
LD_FLAGS = lz -lrt -lpthread
ORTOOLS_LIB = -Wl,-rpath $(OR_ROOT_FULL)/lib -L$(OR_ROOT_FULL)/lib -lortools
PLATFORM = LINUX
LBITS = $(shell getconf LONG_BIT)
@@ -63,6 +63,7 @@ ifeq ("$(SYSTEM)","unix")
endif
ifeq ($(OS),Darwin) # Assume Mac Os X
CCC = clang++ -fPIC -std=c++11
LD_FLAGS = -lz
ORTOOLS_LIB = -L$(OR_ROOT)lib -lortools
PLATFORM = MACOSX
PTRLENGTH = 64