Skip to content

Commit

Permalink
MacOS: use MacOS specific syntax for -pie linking
Browse files Browse the repository at this point in the history
  • Loading branch information
amc1999 committed Feb 4, 2020
1 parent 0e118f5 commit 1f98f51
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion models/makefile.model.mak
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ LIBOPENM_A = libopenm$(BIN_POSTFIX)$(MSG_POSTFIX).a
LIBSQLITE_A = libsqlite$(BIN_POSTFIX).a

L_UCVT_FLAG =
WL_PIE_FLAG = -pie
ifeq ($(PLATFORM_UNAME), Darwin)
L_UCVT_FLAG = -liconv
WL_PIE_FLAG = -Wl,-pie
endif

#
Expand Down Expand Up @@ -218,7 +220,7 @@ $(OBJ_DIR)/%.o : $(MODEL_CODE_DIR)/%.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@

$(OUT_BIN_DIR)/$(MODEL_EXE) : $(OBJS) $(OM_LIB_DIR)/$(LIBOPENM_A) $(OM_LIB_DIR)/$(LIBSQLITE_A)
$(CXX) -pthread -L$(OM_LIB_DIR) -pie -o $@ $(OBJS) -lopenm$(BIN_POSTFIX)$(MSG_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)
$(CXX) -pthread -L$(OM_LIB_DIR) $(WL_PIE_FLAG) -o $@ $(OBJS) -lopenm$(BIN_POSTFIX)$(MSG_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)

#
# create output SQLite database
Expand Down
4 changes: 3 additions & 1 deletion models/modelOne/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ LIBOPENM_A = libopenm$(BIN_POSTFIX)$(MSG_POSTFIX).a
LIBSQLITE_A = libsqlite$(BIN_POSTFIX).a

L_UCVT_FLAG =
WL_PIE_FLAG = -pie
ifeq ($(PLATFORM_UNAME), Darwin)
L_UCVT_FLAG = -liconv
WL_PIE_FLAG = -Wl,-pie
endif

# recognize dependency files
Expand Down Expand Up @@ -111,7 +113,7 @@ $(OBJ_DIR)/%.o : %.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@

$(OUT_BIN_DIR)/$(MODEL_EXE) : $(OBJS) $(OM_LIB_DIR)/$(LIBOPENM_A) $(OM_LIB_DIR)/$(LIBSQLITE_A)
$(CXX) -pthread -L$(OM_LIB_DIR) -pie -o $@ $(OBJS) -lopenm$(BIN_POSTFIX)$(MSG_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)
$(CXX) -pthread -L$(OM_LIB_DIR) $(WL_PIE_FLAG) -o $@ $(OBJS) -lopenm$(BIN_POSTFIX)$(MSG_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)

#
# create model SQLite database
Expand Down
4 changes: 3 additions & 1 deletion openm/omc/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ LIBSQLITE_A = libsqlite$(BIN_POSTFIX).a
LIB_OMC_A = libopenm_omc_db$(BIN_POSTFIX).a

L_UCVT_FLAG =
WL_PIE_FLAG = -pie
ifeq ($(PLATFORM_UNAME), Darwin)
L_UCVT_FLAG = -liconv
WL_PIE_FLAG = -Wl,-pie
endif

# recognize dependency files
Expand Down Expand Up @@ -175,7 +177,7 @@ $(OBJ_DIR)/%.o : %.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@

$(OUT_BIN_DIR)/$(OMC_EXE) : $(OBJS) $(OUT_LIB_DIR)/$(LIB_OMC_A) $(OUT_LIB_DIR)/$(LIBSQLITE_A)
$(CXX) -pthread -L$(OUT_LIB_DIR) -pie -o $@ $(OBJS) -lopenm_omc_db$(BIN_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)
$(CXX) -pthread -L$(OUT_LIB_DIR) $(WL_PIE_FLAG) -o $@ $(OBJS) -lopenm_omc_db$(BIN_POSTFIX) -l$(OM_DB_LIB) -lstdc++ $(L_UCVT_FLAG)

.PHONY : copy_ini
copy_ini:
Expand Down

0 comments on commit 1f98f51

Please sign in to comment.