Browse Source

Fix CMD_PFX

JSON-50
Damiano Boppart 5 years ago
parent
commit
ddad7e04ab
2 changed files with 13 additions and 1 deletions
  1. +11
    -1
      server/Makefile
  2. +2
    -0
      server/Makefile.conf

+ 11
- 1
server/Makefile View File

@ -33,9 +33,15 @@ ALL_OBJECTS0=$(subst .cpp,.o,$(ALL_SOURCE))
ALL_OBJECTS=$(subst .cc,.o,$(ALL_OBJECTS0))
ifeq ($(BUILD_FOR),Linux)
LIBPATH=LD_LIBRARY_PATH
else
LIBPATH=DYLD_LIBRARY_PATH
endif
ifeq ($(BUILD_FOR),Linux)
LD_EAGER_VAR=LD_BIND_NOW=placeholder
else
LIBPATH=LD_LIBRARY_PATH
LD_EAGER_VAR=DYLD_BIND_AT_LAUNCH=placeholder
endif
# Create a list of the extra library paths for the loader.
@ -64,6 +70,10 @@ EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS::=)
CMD_PFX=$(LIBPATH)=$(EXTRA_LIB_PATHS)
ifdef DEBUG
CMD_PFX+= $(LD_EAGER_VAR)
endif
.PHONY: all
all: pep-json-server servertest


+ 2
- 0
server/Makefile.conf View File

@ -47,6 +47,8 @@ WARN=placeholder
######### C++ #########
TARGET_ARCH=
ifeq ($(BUILD_FOR),Linux)
CXX=g++ -std=c++11 -pthread
else ifeq ($(BUILD_FOR),Darwin)


Loading…
Cancel
Save